Hi,
yet another cleanup on base.
Cheers,
-- Takeshi Abe
From dff2f8d6d37863a5517a412ea4f92ebdbee536ff Mon Sep 17 00:00:00 2001
From: Takeshi Abe <tabe@fixedpoint.jp>
Date: Fri, 26 Nov 2010 01:45:21 +0900
Subject: [PATCH] Remove dead codes and undesired comments with fixed typo
---
dbaccess/source/ui/browser/sbagrid.cxx | 3 -
dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx | 1 -
dbaccess/source/ui/dlg/ExtensionNotPresent.hrc | 1 -
dbaccess/source/ui/dlg/dbwizsetup.cxx | 1 -
dbaccess/source/ui/inc/RefFunctor.hxx | 4 -
dbaccess/source/ui/inc/TableRow.hxx | 3 -
dbaccess/source/ui/inc/sbagrid.hxx | 2 -
dbaccess/source/ui/misc/RowSetDrop.cxx | 7 +-
dbaccess/source/ui/misc/WCPage.cxx | 5 +-
dbaccess/source/ui/misc/WCopyTable.cxx | 1 -
dbaccess/source/ui/misc/WTypeSelect.cxx | 1 -
.../ui/relationdesign/RelationController.cxx | 2 -
dbaccess/source/ui/tabledesign/TEditControl.cxx | 28 +--------
.../source/ui/tabledesign/TableDesignControl.cxx | 3 -
dbaccess/source/ui/tabledesign/TableDesignView.cxx | 1 -
reportdesign/inc/RptPage.hxx | 1 -
reportdesign/inc/RptResId.hrc | 1 -
reportdesign/qa/complex/ReportDesignerTest.java | 63 --------------------
reportdesign/source/core/api/ReportDefinition.cxx | 46 ++-------------
reportdesign/source/core/inc/Tools.hxx | 6 +-
reportdesign/source/core/sdr/RptPage.cxx | 29 +--------
reportdesign/source/ui/dlg/AddField.cxx | 8 +--
reportdesign/source/ui/dlg/GroupsSorting.hrc | 10 ---
.../source/ui/inspection/GeometryHandler.cxx | 15 +----
24 files changed, 22 insertions(+), 220 deletions(-)
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index 23c7e24..e8d4459 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -257,8 +257,6 @@ void SAL_CALL SbaXGridControl::createPeer(const Reference< ::com::sun::star::awt
// TODO: why the hell this whole class does not use any mutex?
-// if (0 == m_nPeerCreationLevel)
- {
Reference< ::com::sun::star::frame::XDispatch > xDisp(getPeer(), UNO_QUERY);
for ( StatusMultiplexerArray::iterator aIter = m_aStatusMultiplexer.begin();
aIter != m_aStatusMultiplexer.end();
@@ -267,7 +265,6 @@ void SAL_CALL SbaXGridControl::createPeer(const Reference< ::com::sun::star::awt
if ((*aIter).second && (*aIter).second->getLength())
xDisp->addStatusListener((*aIter).second, (*aIter).first);
}
- }
}
//---------------------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
index fe236af..d2efae3 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
@@ -48,7 +48,6 @@ namespace dbaui
//.........................................................................
class IDatabaseSettingsDialog;
-// static OGenericAdministrationPage* CreateDbaseTabPage( Window* pParent, const
SfxItemSet& _rAttrSet );
//========================================================================
diff --git a/dbaccess/source/ui/dlg/ExtensionNotPresent.hrc
b/dbaccess/source/ui/dlg/ExtensionNotPresent.hrc
index cb314b9..17b4d14 100644
--- a/dbaccess/source/ui/dlg/ExtensionNotPresent.hrc
+++ b/dbaccess/source/ui/dlg/ExtensionNotPresent.hrc
@@ -37,7 +37,6 @@
#define BUTTON_HEIGHT 14
#define BUTTON_WIDTH 55
#define BROWSER_HEIGHT 75
-// #define PAGE_WIDTH ( CELL_PADDING + BUTTON_WIDTH + CELL_PADDING + BUTTON_WIDTH
+ CELL_PADDING)
#define LEFT_PADDING 32 /* size for the icon */
#define RIGHT_PADDING 16
#define DLG_WIDTH ( 250 )
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index 5c2d19a..3e64f82 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -181,7 +181,6 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(Window* _pParent
m_pOutSet = new SfxItemSet( *_pItems->GetPool(), _pItems->GetRanges() );
m_pImpl->translateProperties(xDatasource, *m_pOutSet);
-// eType = m_pImpl->getDatasourceType(*m_pOutSet);
SetPageSizePixel(LogicToPixel(::Size(WIZARD_PAGE_X, WIZARD_PAGE_Y), MAP_APPFONT));
ShowButtonFixedLine(sal_True);
diff --git a/dbaccess/source/ui/inc/RefFunctor.hxx b/dbaccess/source/ui/inc/RefFunctor.hxx
index 6e33ef2..7782fec 100644
--- a/dbaccess/source/ui/inc/RefFunctor.hxx
+++ b/dbaccess/source/ui/inc/RefFunctor.hxx
@@ -47,10 +47,6 @@ namespace dbaui
{
m_aFunction(_aType.get());
}
-// inline void operator()(const ::rtl::Reference<T>& _aType)
-// {
-// m_aFunction(_aType.get());
-// }
};
// -----------------------------------------------------------------------------
} // namespace dbaui
diff --git a/dbaccess/source/ui/inc/TableRow.hxx b/dbaccess/source/ui/inc/TableRow.hxx
index edaab51..ace9eca 100644
--- a/dbaccess/source/ui/inc/TableRow.hxx
+++ b/dbaccess/source/ui/inc/TableRow.hxx
@@ -37,9 +37,6 @@
namespace dbaui
{
-// class OTableRow;
-// friend SvStream& operator<<( SvStream& rStr, OTableRow& _rRow );
-
class OFieldDescription;
class OTypeInfo;
class OTableRow
diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx
index 5e8a7c4..76a01ce 100644
--- a/dbaccess/source/ui/inc/sbagrid.hxx
+++ b/dbaccess/source/ui/inc/sbagrid.hxx
@@ -29,8 +29,6 @@
#ifndef _SBA_GRID_HXX
#define _SBA_GRID_HXX
-// #include <sdb/tools.hxx>
-
#include <svx/fmgridcl.hxx>
#include <svx/fmgridif.hxx>
diff --git a/dbaccess/source/ui/misc/RowSetDrop.cxx b/dbaccess/source/ui/misc/RowSetDrop.cxx
index 4fc8139..3656c8c 100644
--- a/dbaccess/source/ui/misc/RowSetDrop.cxx
+++ b/dbaccess/source/ui/misc/RowSetDrop.cxx
@@ -48,7 +48,6 @@ using namespace ::com::sun::star::util;
using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::sdb;
using namespace ::com::sun::star::lang;
-// using namespace ::com::sun::star::sdbcx;
// export data
ORowSetImportExport::ORowSetImportExport( Window* _pParent,
@@ -84,7 +83,7 @@ void ORowSetImportExport::initialize()
m_aColumnTypes.reserve(nCount);
for (sal_Int32 i = 1;i <= nCount; ++i)
{
- sal_Int32 nPos = -1; // -1 means column is autoincrement or doesn't exists
+ sal_Int32 nPos = -1; // -1 means column is autoincrement or doesn't exist
if(!m_xTargetResultSetMetaData->isAutoIncrement(i))
{
try
@@ -95,7 +94,7 @@ void ORowSetImportExport::initialize()
catch(const SQLException&)
{
if(m_xTargetResultSetMetaData->isNullable(i))
- nPos = 0; // column doesn't exists but we could set it to null
+ nPos = 0; // column doesn't exist but we could set it to null
}
}
@@ -131,7 +130,7 @@ BOOL ORowSetImportExport::Read()
{
sal_Int32 nPos = -1;
*pBegin >>= nPos;
- OSL_ENSURE(nPos != -1,"Invalid posiotion!");
+ OSL_ENSURE(nPos != -1,"Invalid position!");
bContinue = (m_xResultSet.is() && m_xResultSet->absolute(nPos) && insertNewRow());
}
}
diff --git a/dbaccess/source/ui/misc/WCPage.cxx b/dbaccess/source/ui/misc/WCPage.cxx
index 841b00a..930eeee 100644
--- a/dbaccess/source/ui/misc/WCPage.cxx
+++ b/dbaccess/source/ui/misc/WCPage.cxx
@@ -134,7 +134,7 @@ IMPL_LINK( OCopyTable, AppendDataClickHdl, Button*, /*pButton*/ )
SetAppendDataRadio();
return 0;
}
-//--------dyf ADD
+
void OCopyTable::SetAppendDataRadio()
{
m_pParent->EnableButton(OCopyTableWizard::WIZARD_NEXT,sal_True);
@@ -144,7 +144,6 @@ void OCopyTable::SetAppendDataRadio()
m_pParent->setOperation(CopyTableOperation::AppendData);
}
-//--------add end
//------------------------------------------------------------------------
IMPL_LINK( OCopyTable, RadioChangeHdl, Button*, pButton )
{
@@ -351,7 +350,6 @@ void OCopyTable::setCreatePrimaryKey( bool _bDoCreate, const ::rtl::OUString& _r
}
// -----------------------------------------------------------------------------
-//---dyf add 2006/7/10
void OCopyTable::setCreateStyleAction()
{
// reselect the last action before
@@ -382,6 +380,5 @@ void OCopyTable::setCreateStyleAction()
}
}
}
-//---add end
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx
index d3ab45c..bf8eab4 100644
--- a/dbaccess/source/ui/misc/WCopyTable.cxx
+++ b/dbaccess/source/ui/misc/WCopyTable.cxx
@@ -1049,7 +1049,6 @@ void OCopyTableWizard::CheckButtons()
void OCopyTableWizard::EnableButton(Wizard_Button_Style eStyle,sal_Bool bEnable)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com",
"OCopyTableWizard::EnableButton" );
-// CheckButtons();
Button* pButton;
if(eStyle == WIZARD_NEXT)
pButton = &m_pbNext;
diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx
index f7a02e3..de188ed 100644
--- a/dbaccess/source/ui/misc/WTypeSelect.cxx
+++ b/dbaccess/source/ui/misc/WTypeSelect.cxx
@@ -49,7 +49,6 @@ using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::util;
using namespace ::com::sun::star::sdbc;
-// using namespace ::com::sun::star::sdbcx;
//========================================================================
// OWizTypeSelectControl
diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx
b/dbaccess/source/ui/relationdesign/RelationController.cxx
index f38aedb..c8d470d 100644
--- a/dbaccess/source/ui/relationdesign/RelationController.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationController.cxx
@@ -96,8 +96,6 @@ using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::sdb;
using namespace ::com::sun::star::ui::dialogs;
using namespace ::com::sun::star::util;
-// using namespace ::com::sun::star::sdbcx;
-// using namespace ::connectivity;
using namespace ::dbtools;
using namespace ::dbaui;
using namespace ::comphelper;
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx
b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index f1e0b0e..1a1eb6f 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -241,11 +241,6 @@ void OTableEditorCtrl::SetReadOnly( sal_Bool bRead )
DeactivateCell();
//////////////////////////////////////////////////////////////////////
- // ::com::sun::star::beans::Property Controls disablen
-// if (pDescrWin)
-// pDescrWin->SetReadOnly(bReadOnly || !SetDataPtr(nRow) || GetActRow()->IsReadOnly());
-
- //////////////////////////////////////////////////////////////////////
// Cursor des Browsers anpassen
BrowserMode nMode(BROWSER_COLUMNSELECTION | BROWSER_MULTISELECTION | BROWSER_KEEPSELECTION |
BROWSER_HLINESFULL | BROWSER_VLINESFULL|BROWSER_AUTOSIZE_LASTCOL);
@@ -313,7 +308,7 @@ void OTableEditorCtrl::InitCellController()
const Size aTemp( pControls[i]->GetOptimalSize(WINDOWSIZE_PREFERRED) );
if ( aTemp.Height() > aHeight.Height() )
aHeight.Height() = aTemp.Height();
- } // for(int i= 0; i < SAL_N_ELEMENTS(pControls);++i
+ }
SetDataRowHeight(aHeight.Height());
ClearModified();
@@ -402,8 +397,6 @@ void OTableEditorCtrl::PaintCell(OutputDevice& rDev, const Rectangle& rRect,
if (rDev.IsClipRegion())
rDev.SetClipRegion();
-// rDev.DrawText(rRect.TopLeft(), aText);
-// rDev.SetClipRegion( );
}
//------------------------------------------------------------------------------
@@ -711,15 +704,6 @@ sal_Bool OTableEditorCtrl::SaveModified()
switch( nColId )
{
//////////////////////////////////////////////////////////////
- // NameCell
- case FIELD_NAME:
- {
- // removed the former duplicate-check. this is done in
OTableDocShell::CheckDefConsistency now.
- // FS - 07.12.99 - 69575
-
- } break;
-
- //////////////////////////////////////////////////////////////
// TypeCell
case FIELD_TYPE:
{
@@ -1191,7 +1175,6 @@ void OTableEditorCtrl::SetCellData( long nRow, sal_uInt16 nColId, const
::com::s
break;
case FIELD_PROPERTY_NUMTYPE:
- // pFieldDescr->SetNumType( _rNewData );
OSL_ENSURE(sal_False, "OTableEditorCtrl::SetCellData: invalid column!");
break;
@@ -1276,7 +1259,7 @@ Any OTableEditorCtrl::GetCellData( long nRow, sal_uInt16 nColId )
case FIELD_PROPERTY_NUMTYPE:
OSL_ENSURE(sal_False, "OTableEditorCtrl::GetCellData: invalid column!");
- // return pFieldDescr->GetNumType();
+ break;
case FIELD_PROPERTY_AUTOINC:
sValue = pFieldDescr->IsAutoIncrement() ? strYes : strNo;
@@ -1360,11 +1343,6 @@ sal_Bool OTableEditorCtrl::IsCutAllowed( long nRow )
}
}
-// Reference<XPropertySet> xTable = GetView()->getController().getTable();
-// if( !IsCopyAllowed(nRow) || (xTable.is() &&
::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) ==
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEW"))))
-// return sal_False;
-
- // return bCutAllowed && IsDeleteAllowed( nRow );
return bIsCutAllowed;
}
@@ -1779,7 +1757,7 @@ void OTableEditorCtrl::AdjustFieldDescription(OFieldDescription* _pFieldDesc,
{
_pFieldDesc->SetIsNullable(ColumnValue::NO_NULLS);
_pFieldDesc->SetControlDefault(Any());
- } // if(!_bSet && _pFieldDesc->getTypeInfo()->bNullable)
+ }
if ( _pFieldDesc->IsAutoIncrement() && !_bPrimaryKey )
{
OTableController& rController = GetView()->getController();
diff --git a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
index 344604c..e35fc32 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
@@ -75,9 +75,6 @@ void OTableRowView::Init()
{
EditBrowseBox::Init();
-// SetMapMode( MapMode(MAP_TWIP) );
-// GetDataWindow().SetMapMode( GetMapMode() );
-
Font aFont( GetDataWindow().GetFont() );
aFont.SetWeight( WEIGHT_NORMAL );
GetDataWindow().SetFont( aFont );
diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx
b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
index e42d31b..8e52ba3 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
@@ -148,7 +148,6 @@ void OTableBorderWindow::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground,
if ( IsControlFont() )
aFont.Merge( GetControlFont() );
SetPointFont( aFont );
-// Set/*Zoomed*/PointFont( aFont );
}
if ( bFont || bForeground )
diff --git a/reportdesign/inc/RptPage.hxx b/reportdesign/inc/RptPage.hxx
index 1313184..5daac5e 100644
--- a/reportdesign/inc/RptPage.hxx
+++ b/reportdesign/inc/RptPage.hxx
@@ -40,7 +40,6 @@ namespace rptui
//============================================================================
class OReportModel;
-//class OReportSection;
class REPORTDESIGN_DLLPUBLIC OReportPage : public SdrPage
{
diff --git a/reportdesign/inc/RptResId.hrc b/reportdesign/inc/RptResId.hrc
index a9c82ad..62be3d1 100644
--- a/reportdesign/inc/RptResId.hrc
+++ b/reportdesign/inc/RptResId.hrc
@@ -234,7 +234,6 @@
#define RID_STR_PARAADJUST (RID_STRING_START + 161)
-// #define RID_STR_ (RID_STRING_START + 130)
// -----------------------------------------------------------------------
#define RID_PAGEDIALOG_PAGE ( RID_PAGE_START + 1 )
#define RID_PAGEDIALOG_BACKGROUND ( RID_PAGE_START + 2 )
diff --git a/reportdesign/qa/complex/ReportDesignerTest.java
b/reportdesign/qa/complex/ReportDesignerTest.java
index 2a652fa..7d9262a 100755
--- a/reportdesign/qa/complex/ReportDesignerTest.java
+++ b/reportdesign/qa/complex/ReportDesignerTest.java
@@ -47,9 +47,6 @@ import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XInterface;
import com.sun.star.util.XCloseable;
-// import util.BasicMacroTools;
-// import util.DesktopTools;
-// import util.dbg;
import complexlib.ComplexTestCase;
import util.utils;
import helper.OfficeProvider;
@@ -58,26 +55,6 @@ import helper.OfficeWatcher;
import convwatch.DB;
-// import java.util.Date;
-// import java.text.SimpleDateFormat;
-// import java.text.ParsePosition;
-// import java.sql.Time;
-//
-// import java.io.BufferedReader;
-// import java.io.File;
-// import java.io.FileReader;
-// import java.io.IOException;
-// import java.io.FilenameFilter;
-//
-// import java.util.Vector;
-//
-// import helper.AppProvider;
-// import java.text.DecimalFormat;
-// import util.DynamicClassLoader;
-// import java.util.StringTokenizer;
-
-
-
class PropertySetHelper
{
@@ -327,15 +304,6 @@ public class ReportDesignerTest extends ComplexTestCase {
XComponent xDocComponent = loadComponent(sFileURL, getXDesktop(), null);
log.println("Load done");
-// context = createUnoService("com.sun.star.sdb.DatabaseContext")
-// oDataBase = context.getByName("hh")
-// oDBDoc = oDataBase.DatabaseDocument
-//
-// dim args(1) as new com.sun.star.beans.PropertyValue
-// args(0).Name = "ActiveConnection"
-// args(0).Value = oDBDoc.getCurrentController().getPropertyValue("ActiveConnection")
-// reportContainer = oDBDoc.getReportDocuments()
-// report = reportContainer.loadComponentFromURL("Report40","",0,args)
try
{
@@ -346,45 +314,24 @@ public class ReportDesignerTest extends ComplexTestCase {
XNameAccess xNameAccess = (XNameAccess)
UnoRuntime.queryInterface(XNameAccess.class, x);
showElements(xNameAccess);
Object aObj = xNameAccess.getByName(sFileURL);
-// log.println("1");
- // PropertySetHelper aHelper = new PropertySetHelper(aObj);
XDocumentDataSource xDataSource =
(XDocumentDataSource)UnoRuntime.queryInterface(XDocumentDataSource.class, aObj);
-// Object aDatabaseDocmuent =
aHelper.getPropertyValueAsObject("DatabaseDocument");
XOfficeDatabaseDocument xOfficeDBDoc = xDataSource.getDatabaseDocument();
- // XOfficeDatabaseDocument xOfficeDBDoc =
(XOfficeDatabaseDocument)UnoRuntime.queryInterface(XOfficeDatabaseDocument.class,
aDatabaseDocument);
assure("can't access DatabaseDocument", xOfficeDBDoc != null);
-// log.println("2");
XModel xDBSource = (XModel)UnoRuntime.queryInterface(XModel.class, xOfficeDBDoc);
Object aController = xDBSource.getCurrentController();
assure("Controller of xOfficeDatabaseDocument is empty!", aController != null);
-// log.println("3");
XDatabaseDocumentUI aDBDocUI =
(XDatabaseDocumentUI)UnoRuntime.queryInterface(XDatabaseDocumentUI.class, aController);
boolean isConnect = aDBDocUI.connect();
-// if (isConnect)
-// {
-// System.out.println("true");
-// }
-// else
-// {
-// System.out.println("false");
-// }
-// log.println("4");
-
- // aHelper = new PropertySetHelper(aController);
-
- // Object aActiveConnectionObj =
aHelper.getPropertyValueAsObject("ActiveConnection");
Object aActiveConnectionObj = aDBDocUI.getActiveConnection();
assure("ActiveConnection is empty", aActiveConnectionObj != null);
-// log.println("5");
XReportDocumentsSupplier xSupplier =
(XReportDocumentsSupplier)UnoRuntime.queryInterface(XReportDocumentsSupplier.class, xOfficeDBDoc);
xNameAccess = xSupplier.getReportDocuments();
assure("xOfficeDatabaseDocument returns no Report Document", xNameAccess != null);
-// log.println("5");
showElements(xNameAccess);
@@ -403,11 +350,6 @@ public class ReportDesignerTest extends ComplexTestCase {
log.println("ERROR: Exception caught");
}
- // String mTestDocumentPath = (String) param.get("TestDocumentPath");
- // System.out.println("mTestDocumentPath: '" + mTestDocumentPath + "'");
- // // workaround for issue using deprecated "DOCPTH" prop
- // System.setProperty("DOCPTH", mTestDocumentPath);
-
// Close the document
closeComponent(xDocComponent);
}
@@ -440,8 +382,6 @@ public class ReportDesignerTest extends ComplexTestCase {
sDestinationVersion, sDestinationName,
sDestinationCreatorType,
sDocumentPoolDir, sDocumentPoolName, m_sMailAddress,
sSpecial);
- // DB.test();
- // System.exit(1);
}
private void loadAndStoreReports(XNameAccess _xNameAccess, ArrayList _aPropertyList, int
_nType)
@@ -505,9 +445,6 @@ public class ReportDesignerTest extends ComplexTestCase {
sOutputPath += "tmp_123";
sOutputPath += System.getProperty("file.separator");
- // sOutputPath += getFileFormat(_nType);
- // sOutputPath += System.getProperty("file.separator");
-
File aOutputFile = new File(sOutputPath); // create the directory of the given output
path
aOutputFile.mkdirs();
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx
b/reportdesign/source/core/api/ReportDefinition.cxx
index 1cbe0ef..3aa92b2 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -239,7 +239,6 @@ void lcl_extractAndStartStatusIndicator( const ::comphelper::MediaDescriptor& _r
catch( const uno::Exception& )
{
OSL_ENSURE( sal_False, "lcl_extractAndStartStatusIndicator: caught an exception!" );
-// DBG_UNHANDLED_EXCEPTION();
}
}
// -----------------------------------------------------------------------------
@@ -318,30 +317,23 @@ OStyle::OStyle()
registerPropertyNoMember( PROPERTY_NAME, ++i,nBound,::getCppuType( static_cast<
::rtl::OUString *>(NULL) ), &sName );
registerPropertyNoMember(PROPERTY_BACKCOLOR,
++i,nBound,::getCppuType((const sal_Int32*)0) ,&nTransparent);
- //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_GRAPHICFILT),
++i,nBound,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty);
registerPropertyNoMember(PROPERTY_BACKGRAPHICLOCATION, ++i,nBound,::getCppuType((const
style::GraphicLocation*)0) ,&eGraphicLocation);
- //registerPropertyNoMember(PROPERTY_BACKGRAPHICURL, ++i,nBound,::getCppuType((const
::rtl::OUString*)0) ,&sEmpty);
registerPropertyNoMember(PROPERTY_BACKTRANSPARENT, ++i,nBound,::getBooleanCppuType() ,&bTrue);
- //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_BACKCOLOR),
++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_BORDERDIST),
++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_BOTTBORDER),
++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_BOTTBRDDIST),
++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
registerPropertyNoMember(PROPERTY_BOTTOMMARGIN, ++i,nBound,::getCppuType((const
sal_Int32*)0) ,&nMargin);
registerPropertyNoMember(MAP_CHAR_LEN("DisplayName"),
++i,nBound,::getCppuType((rtl::OUString*)0) ,&sEmpty);
- //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FIRSTPAGE),
++i,nBound,::getCppuType((const sal_Int16*)0) ,&n16Zero);
- //
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBACKCOL),
++i,nBound,::getCppuType((const sal_Int32*)0) ,&nTransparent);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFFILT),
++i,nBound,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFLOC),
++i,nBound,::getCppuType((const style::GraphicLocation*)0) ,&eGraphicLocation);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFURL),
++i,nBound,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBACKTRAN),
++i,nBound,::getBooleanCppuType() ,&bTrue);
- //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_FTRBACKCOL),
++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBODYDIST),
++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBRDDIST),
++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBOTTBOR),
++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBOTTBDIS),
++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
- //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_FTRDYNAMIC),
++i,nBound,::getBooleanCppuType() ,&bFalse);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRHEIGHT),
++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRDYNAMIC),
++i,nBound,::getBooleanCppuType() ,&bFalse);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRON),
++i,nBound,::getBooleanCppuType() ,&bFalse);
@@ -349,12 +341,10 @@ OStyle::OStyle()
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTBOR),
++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTBDIS),
++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTMAR),
++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
- //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_FTRON),
++i,nBound,::getBooleanCppuType() ,&bFalse);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTBOR),
++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTBDIS),++i,nBound,::getCppuType((const
sal_Int32*)0) ,&nZero);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTMAR),
++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRSHADOW),
++i,nBound,::getCppuType((const table::ShadowFormat*)0) ,&eShadowFormat);
- //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_FTRSHARED),
++i,nBound,::getBooleanCppuType() ,&bFalse);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRTOPBOR),
++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRTOPBDIS),
++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
//
@@ -363,12 +353,10 @@ OStyle::OStyle()
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFLOC),
++i,nBound|nMayBeVoid,::getCppuType((const style::GraphicLocation*)0) ,&eGraphicLocation);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFURL),
++i,nBound|nMayBeVoid,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBACKTRAN),
++i,nBound|nMayBeVoid,::getBooleanCppuType() ,&bTrue);
- //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_HDRBACKCOL),
++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBODYDIST),
++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBRDDIST),
++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBOTTBOR),
++i,nBound|nMayBeVoid,::getCppuType((const table::BorderLine*)0) ,&eBorderLine);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBOTTBDIS),
++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero);
- //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_HDRDYNAMIC),
++i,nBound,::getBooleanCppuType() ,&bFalse);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRHEIGHT),
++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRDYNAMIC),
++i,nBound|nMayBeVoid,::getBooleanCppuType() ,&bFalse);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRON),
++i,nBound|nMayBeVoid,::getBooleanCppuType() ,&bFalse);
@@ -376,23 +364,18 @@ OStyle::OStyle()
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTBOR),
++i,nBound|nMayBeVoid,::getCppuType((const table::BorderLine*)0) ,&eBorderLine);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTBDIS),
++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTMAR),
++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero);
- //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_HDRON),
++i,nBound,::getBooleanCppuType() ,&bFalse);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRRIGHTBOR),
++i,nBound|nMayBeVoid,::getCppuType((const table::BorderLine*)0) ,&eBorderLine);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRRIGHTBDIS),++i,nBound|nMayBeVoid,::getCppuType((const
sal_Int32*)0) ,&nZero);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRRIGHTMAR),
++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRSHADOW),
++i,nBound|nMayBeVoid,::getCppuType((const table::ShadowFormat*)0) ,&eShadowFormat);
- //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_HDRSHARED),
++i,nBound,::getBooleanCppuType() ,&bFalse);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRTOPBOR),
++i,nBound|nMayBeVoid,::getCppuType((const table::BorderLine*)0) ,&eBorderLine);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRTOPBDIS),
++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero);
//
registerProperty(PROPERTY_HEIGHT, ++i,nBound,&m_aSize.Height,
::getCppuType((const sal_Int32*)0) );
- //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_BACKTRANS), ++i,nBound,
::getBooleanCppuType() ,&bFalse);
registerPropertyNoMember(PROPERTY_ISLANDSCAPE, ++i,nBound,
::getBooleanCppuType() ,&bFalse);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_LEFTBORDER), ++i,nBound,
::getCppuType((const table::BorderLine*)0) ,&eBorderLine);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_LEFTBRDDIST), ++i,nBound,
::getCppuType((const sal_Int32*)0) ,&nZero);
registerPropertyNoMember(PROPERTY_LEFTMARGIN, ++i,beans::PropertyAttribute::BOUND,
::getCppuType((const sal_Int32*)0) ,&nMargin);
- //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_LEFTFTRCONT),
++i,nBound,::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0) ,NULL);
- //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_LEFTHDRCONT),
++i,nBound,::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0) ,NULL);
registerPropertyNoMember(PROPERTY_NUMBERINGTYPE, ++i,nBound,::getCppuType((const
sal_Int16*)0) ,&nNummeringType);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_SCALEVAL),
++i,nBound,::getCppuType((const sal_Int16*)0) ,&n16Zero);
registerPropertyNoMember(PROPERTY_PAGESTYLELAYOUT, ++i,nBound,::getCppuType((const
style::PageStyleLayout*)0) ,&ePageStyleLayout);
@@ -401,8 +384,6 @@ OStyle::OStyle()
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTBORDER),
++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTBRDDIST),++i,nBound,::getCppuType((const
sal_Int32*)0) ,&nZero);
registerPropertyNoMember(PROPERTY_RIGHTMARGIN,
++i,beans::PropertyAttribute::BOUND,::getCppuType((const sal_Int32*)0) ,&nMargin);
- //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTFTRCON),
++i,nBound,::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0) ,NULL);
- //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTHDRCON),
++i,nBound,::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0) ,NULL);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_SCALETOPAG),
++i,nBound,::getCppuType((const sal_Int16*)0) ,&n16Zero);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_SCALETOX),
++i,nBound,::getCppuType((const sal_Int16*)0) ,&n16Zero);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_SCALETOY),
++i,nBound,::getCppuType((const sal_Int16*)0) ,&n16Zero);
@@ -411,12 +392,9 @@ OStyle::OStyle()
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_TOPBORDER),
++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_TOPBRDDIST),
++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
registerPropertyNoMember(PROPERTY_TOPMARGIN, ++i,nBound,::getCppuType((const
sal_Int32*)0) ,&nMargin);
-
//registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_FTRBACKTRAN),++i,nBound,::getBooleanCppuType()
,&bFalse);
-
//registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_HDRBACKTRAN),++i,nBound,::getBooleanCppuType()
,&bFalse);
uno::Reference< container::XNameContainer> xAttribs =
::comphelper::NameContainer_createInstance(::getCppuType(static_cast< xml::AttributeData* >(NULL)));
registerPropertyNoMember(MAP_CHAR_LEN("UserDefinedAttributes"),
++i,nBound,::getCppuType((uno::Reference<container::XNameContainer>*)0) ,&xAttribs);
registerProperty(PROPERTY_WIDTH, ++i,nBound,&m_aSize.Width,::getCppuType((const
sal_Int32*)0) );
- //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNONAME_WRITING),
++i,nBound,:.getCppuType((sal_Int16*)0) ,&n16Zero);
registerPropertyNoMember(MAP_CHAR_LEN("PrinterName"),
++i,nBound,::getCppuType((const ::rtl::OUString*)0),&sEmpty);
uno::Sequence<sal_Int8> aSe;
registerPropertyNoMember(MAP_CHAR_LEN("PrinterSetup"),
++i,nBound,::getCppuType((const uno::Sequence<sal_Int8>*)0),&aSe);
@@ -1409,10 +1387,6 @@ uno::Reference< uno::XInterface > SAL_CALL
OReportDefinition::getCurrentSelectio
void OReportDefinition::impl_loadFromStorage_nolck_throw( const uno::Reference< embed::XStorage >&
_xStorageToLoadFrom,
const uno::Sequence< beans::PropertyValue >& _aMediaDescriptor )
{
-// ::osl::MutexGuard aGuard(m_aMutex);
-// ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
-//
-
m_pImpl->m_xStorage = _xStorageToLoadFrom;
::comphelper::MediaDescriptor aDescriptor( _aMediaDescriptor );
@@ -1512,7 +1486,7 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference<
embed::XS
{
const ::rtl::OUString sVal(
aDescriptor.getUnpackedValueOrDefault(aDescriptor.PROP_DOCUMENTBASEURL(),::rtl::OUString()) );
xInfoSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BaseURI")),
uno::makeAny(sVal));
- } // if ( aSaveOpt.IsSaveRelFSys() )
+ }
const ::rtl::OUString sHierarchicalDocumentName(
aDescriptor.getUnpackedValueOrDefault(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HierarchicalDocumentName")),::rtl::OUString())
);
xInfoSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StreamRelPath")),
uno::makeAny(sHierarchicalDocumentName));
@@ -1565,7 +1539,7 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference<
embed::XS
sWarnFile = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("meta.xml"));
}
}
- } // if( !bErr )
+ }
if( !bErr )
{
@@ -1594,7 +1568,7 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference<
embed::XS
bErr = sal_True;
sErrFile = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("content.xml"));
}
- } // if ( !bErr )
+ }
uno::Any aImage;
uno::Reference< embed::XVisualObject >
xCurrentController(getCurrentController(),uno::UNO_QUERY);
@@ -1909,15 +1883,12 @@ void SAL_CALL OReportDefinition::setVisualAreaSize( ::sal_Int64 _nAspect,
const
{
::osl::MutexGuard aGuard(m_aMutex);
::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
- //if( nAspect == embed::Aspects::MSOLE_CONTENT )
- {
bool bChanged =
(m_pImpl->m_aVisualAreaSize.Width != _aSize.Width ||
m_pImpl->m_aVisualAreaSize.Height != _aSize.Height);
m_pImpl->m_aVisualAreaSize = _aSize;
if( bChanged )
setModified( sal_True );
- }
m_pImpl->m_nAspect = _nAspect;
}
// -----------------------------------------------------------------------------
@@ -2081,8 +2052,6 @@ uno::Reference< container::XIndexAccess > SAL_CALL
OReportDefinition::getViewDat
{
m_pImpl->m_xViewData.set(m_aProps->m_xContext->getServiceManager()->createInstanceWithContext(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.IndexedPropertyValues")),m_aProps->m_xContext
),uno::UNO_QUERY);
- //uno::Sequence< beans::PropertyValue > aProps;
-
//m_pImpl->m_xViewData->insertByIndex(m_pImpl->m_xViewData->getCount(),uno::makeAny(aProps));
uno::Reference< container::XIndexContainer >
xContainer(m_pImpl->m_xViewData,uno::UNO_QUERY);
::std::vector< uno::Reference< frame::XController> >::iterator aIter =
m_pImpl->m_aControllers.begin();
::std::vector< uno::Reference< frame::XController> >::iterator aEnd =
m_pImpl->m_aControllers.end();
@@ -2097,7 +2066,7 @@ uno::Reference< container::XIndexAccess > SAL_CALL
OReportDefinition::getViewDat
catch(uno::Exception&)
{
}
- } // if ( aIter->is() )
+ }
}
}
@@ -2271,7 +2240,7 @@ uno::Reference< uno::XInterface > SAL_CALL
OReportDefinition::createInstanceWith
*pIter >>= aValue;
if( aValue.Name.equalsAscii( "Storage" ) )
aValue.Value >>= xStorage;
- } // for(;pIter != pEnd ;++pIter)
+ }
m_pImpl->m_pObjectContainer->SwitchPersistence(xStorage);
xRet = static_cast< ::cppu::OWeakObject* >(SvXMLEmbeddedObjectHelper::Create(
xStorage,*this, EMBEDDEDOBJECTHELPER_MODE_READ ));
}
@@ -2327,35 +2296,30 @@ uno::Reference< uno::XInterface > SAL_CALL
OReportDefinition::createInstance( co
{
if ( !m_pImpl->m_xGradientTable.is() )
m_pImpl->m_xGradientTable.set(SvxUnoGradientTable_createInstance(m_pImpl->m_pReportModel.get()),uno::UNO_QUERY);
- //comphelper::NameContainer_createInstance( ::getCppuType( (const awt::Gradient*) 0 )
).get();
return m_pImpl->m_xGradientTable;
}
else if ( aServiceSpecifier.reverseCompareToAsciiL(
RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.HatchTable") ) == 0 )
{
if ( !m_pImpl->m_xHatchTable.is() )
m_pImpl->m_xHatchTable.set(SvxUnoHatchTable_createInstance(m_pImpl->m_pReportModel.get()),uno::UNO_QUERY);
- //comphelper::NameContainer_createInstance( ::getCppuType( (const drawing::Hatch*) 0 )
).get();
return m_pImpl->m_xHatchTable;
}
else if ( aServiceSpecifier.reverseCompareToAsciiL(
RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.BitmapTable") ) == 0 )
{
if ( !m_pImpl->m_xBitmapTable.is() )
m_pImpl->m_xBitmapTable.set(SvxUnoBitmapTable_createInstance(m_pImpl->m_pReportModel.get()),uno::UNO_QUERY);
- //comphelper::NameContainer_createInstance( ::getCppuType( (const ::rtl::OUString*) 0
) ).get();
return m_pImpl->m_xBitmapTable;
}
else if ( aServiceSpecifier.reverseCompareToAsciiL(
RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.TransparencyGradientTable") ) == 0 )
{
if ( !m_pImpl->m_xTransparencyGradientTable.is() )
m_pImpl->m_xTransparencyGradientTable.set(SvxUnoTransGradientTable_createInstance(m_pImpl->m_pReportModel.get()),uno::UNO_QUERY);
- //comphelper::NameContainer_createInstance( ::getCppuType( (const awt::Gradient*) 0 )
).get();
return m_pImpl->m_xTransparencyGradientTable;
}
else if ( aServiceSpecifier.reverseCompareToAsciiL(
RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.DashTable") ) == 0 )
{
if ( !m_pImpl->m_xDashTable.is() )
m_pImpl->m_xDashTable.set(SvxUnoDashTable_createInstance(m_pImpl->m_pReportModel.get()),uno::UNO_QUERY);
- //comphelper::NameContainer_createInstance( ::getCppuType( (const drawing::LineDash*)
0 ) ).get();
return m_pImpl->m_xDashTable;
}
else if( 0 == aServiceSpecifier.reverseCompareToAsciiL(
RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.MarkerTable") ) )
diff --git a/reportdesign/source/core/inc/Tools.hxx b/reportdesign/source/core/inc/Tools.hxx
index 81d7a00..377171e 100644
--- a/reportdesign/source/core/inc/Tools.hxx
+++ b/reportdesign/source/core/inc/Tools.hxx
@@ -50,7 +50,6 @@ namespace reportdesign
if ( _bOn && !_xSection.is() )
_xSection = new OSection(_xParent,_xParent->getContext(),_bPageSection);
else if ( !_bOn )
- //_xSection.clear();
::comphelper::disposeComponent(_xSection);
}
@@ -96,7 +95,7 @@ namespace reportdesign
public:
template<typename T> static void setSize(const ::com::sun::star::awt::Size& aSize,T*
_pShape)
{
- OSL_ENSURE(aSize.Width >= 0 && aSize.Height >= 0,"Illegal with or height!");
+ OSL_ENSURE(aSize.Width >= 0 && aSize.Height >= 0,"Illegal width or height!");
::osl::MutexGuard aGuard(_pShape->m_aMutex);
if ( _pShape->m_aProps.aComponent.m_xShape.is() )
@@ -118,7 +117,7 @@ namespace reportdesign
if ( _pShape->m_aProps.aComponent.m_xShape.is() )
{
::com::sun::star::awt::Size aSize =
_pShape->m_aProps.aComponent.m_xShape->getSize();
- OSL_ENSURE(aSize.Width >= 0 && aSize.Height >= 0,"Illegal with or height!");
+ OSL_ENSURE(aSize.Width >= 0 && aSize.Height >= 0,"Illegal width or height!");
return aSize;
}
return
::com::sun::star::awt::Size(_pShape->m_aProps.aComponent.m_nWidth,_pShape->m_aProps.aComponent.m_nHeight);
@@ -154,7 +153,6 @@ namespace reportdesign
if ( _pShape->m_aProps.aComponent.m_xShape.is() )
{
::com::sun::star::awt::Point aPosition =
_pShape->m_aProps.aComponent.m_xShape->getPosition();
-// OSL_ENSURE(aPosition.X >= 0 && aPosition.Y >= 0,"Illegal position!");
return aPosition;
}
return
::com::sun::star::awt::Point(_pShape->m_aProps.aComponent.m_nPosX,_pShape->m_aProps.aComponent.m_nPosY);
diff --git a/reportdesign/source/core/sdr/RptPage.cxx b/reportdesign/source/core/sdr/RptPage.cxx
index b466a60..c6bee7b 100644
--- a/reportdesign/source/core/sdr/RptPage.cxx
+++ b/reportdesign/source/core/sdr/RptPage.cxx
@@ -92,7 +92,7 @@ ULONG OReportPage::getIndexOf(const uno::Reference< report::XReportComponent >&
{
break;
}
- } // for (; i < nCount; ++i)
+ }
return i;
}
//----------------------------------------------------------------------------
@@ -106,7 +106,7 @@ void OReportPage::removeSdrObject(const uno::Reference< report::XReportComponent
OSL_ENSURE(pBase,"Why is this not a OObjectBase?");
if ( pBase )
pBase->EndListening();
- /*delete */RemoveObject(nPos);
+ RemoveObject(nPos);
}
}
// -----------------------------------------------------------------------------
@@ -132,26 +132,11 @@ SdrObject* OReportPage::RemoveObject(ULONG nObjNum)
return pObj;
}
//----------------------------------------------------------------------------
-//namespace
-//{
-// ::rtl::OUString lcl_getControlName(const uno::Reference< lang::XServiceInfo >&
_xServiceInfo)
-// {
-// if ( _xServiceInfo->supportsService( SERVICE_FIXEDTEXT ))
-// return
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FixedText"));
-// if ( _xServiceInfo->supportsService( SERVICE_FORMATTEDFIELD ))
-// return
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FormattedField"));
-// if ( _xServiceInfo->supportsService( SERVICE_IMAGECONTROL))
-// return
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.DatabaseImageControl"));
-//
-// return ::rtl::OUString();
-// }
-//}
-//----------------------------------------------------------------------------
void OReportPage::insertObject(const uno::Reference< report::XReportComponent >& _xObject)
{
DBG_CHKTHIS( rpt_OReportPage,NULL);
OSL_ENSURE(_xObject.is(),"Object is not valid to create a SdrObject!");
- if ( !_xObject.is() ) // || !m_pView )
+ if ( !_xObject.is() )
return;
ULONG nPos = getIndexOf(_xObject);
if ( nPos < GetObjCount() )
@@ -232,14 +217,6 @@ void OReportPage::NbcInsertObject(SdrObject* pObj, ULONG nPos, const
SdrInsertRe
uno::Reference< drawing::XShape> xShape(pObj->getUnoShape(),uno::UNO_QUERY);
pSection->notifyElementAdded(xShape);
- //// check if we are a shape
- //uno::Reference<beans::XPropertySet> xProp(xShape,uno::UNO_QUERY);
- //if ( xProp.is() &&
xProp->getPropertySetInfo()->hasPropertyByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CLSID")))
)
- //{
- // // use
MimeConfigurationHelper::GetStringClassIDRepresentation(MimeConfigurationHelper::GetSequenceClassID(SO3_SCH_OLE_EMBED_CLASSID_8))
- //
xProp->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CLSID")),uno::makeAny(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("12dcae26-281f-416f-a234-c3086127382e"))));
- //}
-
// now that the shape is inserted into its structures, we can allow the OObjectBase
// to release the reference to it
OObjectBase* pObjectBase = dynamic_cast< OObjectBase* >( pObj );
diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx
index c6bca50..1817653 100644
--- a/reportdesign/source/ui/dlg/AddField.cxx
+++ b/reportdesign/source/ui/dlg/AddField.cxx
@@ -76,8 +76,6 @@ class OAddFieldWindowListBox : public SvTreeListBox
OAddFieldWindowListBox(const OAddFieldWindowListBox&);
void operator =(const OAddFieldWindowListBox&);
-protected:
-// virtual void Command( const CommandEvent& rEvt );
public:
OAddFieldWindowListBox( OAddFieldWindow* _pParent );
@@ -207,7 +205,6 @@ OAddFieldWindow::OAddFieldWindow(Window* pParent
m_aHelpText.SetControlBackground( GetSettings().GetStyleSettings().GetFaceColor() );
SetSizePixel(Size(STD_WIN_SIZE_X,STD_WIN_SIZE_Y));
- //Show();
if ( m_xRowSet.is() )
{
@@ -448,7 +445,7 @@ void OAddFieldWindow::fillDescriptor(SvLBoxEntry* _pSelected,::svx::ODataAccessD
uno::Reference<frame::XModel>
xModel(xDocument->getDatabaseDocument(),uno::UNO_QUERY);
if ( xModel.is() )
_rDescriptor[ daDatabaseLocation ] <<= xModel->getURL();
- } // if ( xDocument.is() )
+ }
}
_rDescriptor[ ::svx::daCommand ] <<= GetCommand();
@@ -457,7 +454,6 @@ void OAddFieldWindow::fillDescriptor(SvLBoxEntry* _pSelected,::svx::ODataAccessD
_rDescriptor[ ::svx::daConnection ] <<= getConnection();
ColumnInfo* pInfo = static_cast<ColumnInfo*>(_pSelected->GetUserData());
- // ::rtl::OUString sColumnName = m_pListBox->GetEntryText( _pSelected );
_rDescriptor[ ::svx::daColumnName ] <<= pInfo->sColumnName;
if ( m_xColumns->hasByName( pInfo->sColumnName ) )
_rDescriptor[ ::svx::daColumnObject ] <<= m_xColumns->getByName(pInfo->sColumnName);
@@ -553,7 +549,7 @@ IMPL_LINK( OAddFieldWindow, OnSortAction, ToolBox*, /*NOTINTERESTEDIN*/ )
eSortMode = SortAscending;
else if ( m_aActions.IsItemChecked(SID_FM_SORTDOWN) )
eSortMode = SortDescending;
- } // if ( SID_FM_REMOVE_FILTER_SORT != nCurItem )
+ }
m_pListBox->GetModel()->SetSortMode(eSortMode);
if ( SID_FM_REMOVE_FILTER_SORT == nCurItem )
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.hrc
b/reportdesign/source/ui/dlg/GroupsSorting.hrc
index d717562..2307e33 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.hrc
+++ b/reportdesign/source/ui/dlg/GroupsSorting.hrc
@@ -50,18 +50,8 @@
#define PB_DOWN (21)
#define FL_SEPARATOR2 (22)
#define FL_SEPARATOR3 (23)
-//BTN #define IMG_UP_H (24)
-//BTN #define IMG_DOWN_H (25)
-//BTN #define PB_DELETE (26)
#define TB_TOOLBOX (27)
-// #define IMG_GROUPSORT_MOVE_DOWN (28)
-// #define IMG_GROUPSORT_MOVE_UP (29)
-// #define IMG_GROUPSORT_DELETE (30)
-// #define IMG_GROUPSORT_MOVE_DOWN_H (31)
-// #define IMG_GROUPSORT_MOVE_UP_H (32)
-// #define IMG_GROUPSORT_DELETE_H (33)
-
#define CHECKBOX_HEIGHT 8
#define FIXEDTEXT_HEIGHT 8
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx
b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index 691bef2..8b293a7 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -127,7 +127,6 @@ namespace rptui
{
//........................................................................
using namespace ::com::sun::star;
-//using namespace formula;
// comparing two property instances
struct PropertyCompare : public ::std::binary_function< beans::Property, ::rtl::OUString , bool >
@@ -1329,7 +1328,7 @@ uno::Sequence< beans::Property > SAL_CALL
GeometryHandler::getSupportedPropertie
}
aNewProps.push_back(*pFind);
}
- } // for (size_t i = 0; i < SAL_N_ELEMENTS(pIncludeProperties) ;++i )
+ }
// special property for shapes
// if ( uno::Reference< report::XShape>(m_xReportComponent,uno::UNO_QUERY).is() )
@@ -1450,7 +1449,6 @@ inspection::InteractiveSelectionResult SAL_CALL
GeometryHandler::onInteractivePr
eResult = inspection::InteractiveSelectionResult_ObtainedValue;
beans::PropertyChangeEvent aScopeEvent;
aScopeEvent.PropertyName = PROPERTY_FILLCOLOR;
- // aScopeEvent.OldValue <<= _nOldDataFieldType;
aScopeEvent.NewValue <<= xShape->getPropertyValue(PROPERTY_FILLCOLOR);
m_aPropertyListeners.notify( aScopeEvent,
&beans::XPropertyChangeListener::propertyChange );
}
@@ -1519,7 +1517,7 @@ void SAL_CALL GeometryHandler::actuatingPropertyChanged(const ::rtl::OUString
&
{
_rxInspectorUI->rebuildPropertyUI(PROPERTY_DATAFIELD);
_rxInspectorUI->rebuildPropertyUI(PROPERTY_FORMULALIST);
- } // if ( bEnable )
+ }
m_xFormComponentHandler->actuatingPropertyChanged(ActuatingPropertyName, NewValue,
OldValue, _rxInspectorUI, _bFirstTimeInit);
}
break;
@@ -1669,7 +1667,7 @@ void GeometryHandler::impl_fillFormulaList_nothrow(::std::vector<
::rtl::OUStrin
const uno::Sequence< ::rtl::OUString > aMimeTypes(
xReportDefinition->getAvailableMimeTypes() );
sRet = aMimeTypes[nPos];
}
- } // if ( aFind != aList.end() )
+ }
return sRet;
}
// -----------------------------------------------------------------------------
@@ -1916,13 +1914,6 @@ void GeometryHandler::loadDefaultFunctions()
DefaultFunction aDefault;
aDefault.m_bDeepTraversing = sal_False;
- //aDefault.m_sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Counter"));
- //aDefault.m_sFormula = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:[%FunctionName] +
1"));
- //aDefault.m_sSearchString =
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:\\[[:alpha:]+[:alnum:]*\\][:space:]*\\+[:space:]*1"));
- //aDefault.m_sInitialFormula.IsPresent = sal_True;
- //aDefault.m_sInitialFormula.Value = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:1"));
- //m_aDefaultFunctions.push_back(aDefault);
-
aDefault.m_bPreEvaluated = sal_True;
aDefault.m_sName = String(ModuleRes(RID_STR_F_ACCUMULATION));
--
1.7.2.3
Context
- [Libreoffice] [PATCH] Remove dead codes and undesired comments with fixed typo · Takeshi Abe
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.