[Libreoffice-commits] .: connectivity/source desktop/os2 desktop/source editeng/inc editeng/source embeddedobj/source embeddedobj/test fileaccess/source formula/source fpicker/source framework/inc framework/source scripting/source sfx2/inc sfx2/source svx/inc svx/source ucb/source ucb/workben uui/source xmloff/source
Michael Meeks
mmeeks at kemper.freedesktop.org
Mon Oct 18 11:38:44 PDT 2010
connectivity/source/drivers/calc/CDatabaseMetaData.cxx | 22 -
connectivity/source/drivers/hsqldb/HConnection.cxx | 38 ---
connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx | 7
connectivity/source/inc/dbase/DIndexPage.hxx | 42 ---
connectivity/source/inc/hsqldb/HConnection.hxx | 29 --
desktop/os2/source/applauncher/launcher.cxx | 6
desktop/source/app/appinit.cxx | 22 -
desktop/source/deployment/gui/dp_gui_updatedialog.cxx | 42 ---
desktop/source/deployment/gui/dp_gui_updatedialog.hxx | 3
editeng/inc/editeng/editeng.hxx | 3
editeng/inc/editeng/outliner.hxx | 4
editeng/source/rtf/rtfitem.cxx | 38 ---
editeng/source/rtf/svxrtf.cxx | 56 -----
embeddedobj/source/commonembedding/persistence.cxx | 3
embeddedobj/source/commonembedding/xfactory.cxx | 17 -
embeddedobj/test/Container1/nativelib/nativeview.c | 70 ------
fileaccess/source/FileAccess.cxx | 37 ---
formula/source/core/api/FormulaCompiler.cxx | 17 -
formula/source/core/api/token.cxx | 13 -
fpicker/source/unx/gnome/SalGtkFolderPicker.hxx | 5
framework/inc/classes/menumanager.hxx | 8
framework/inc/services/license.hxx | 4
framework/source/application/framework.cxx | 22 -
framework/source/classes/menumanager.cxx | 105 ---------
framework/source/services/license.cxx | 16 -
scripting/source/vbaevents/eventhelper.cxx | 77 ------
sfx2/inc/sfx2/app.hxx | 4
sfx2/inc/sfx2/bindings.hxx | 4
sfx2/inc/sfx2/childwin.hxx | 11
sfx2/inc/sfx2/ctrlitem.hxx | 2
sfx2/inc/sfx2/dispatch.hxx | 2
sfx2/inc/sfx2/docfac.hxx | 2
sfx2/inc/sfx2/dockwin.hxx | 4
sfx2/inc/sfx2/fcontnr.hxx | 6
sfx2/inc/sfx2/filedlghelper.hxx | 7
sfx2/inc/sfx2/frame.hxx | 4
sfx2/inc/sfx2/hintpost.hxx | 2
sfx2/inc/sfx2/layout.hxx | 12 -
sfx2/inc/sfx2/macrconf.hxx | 6
sfx2/inc/sfx2/macropg.hxx | 2
sfx2/inc/sfx2/mgetempl.hxx | 2
sfx2/inc/sfx2/mnuitem.hxx | 3
sfx2/inc/sfx2/mnumgr.hxx | 2
sfx2/inc/sfx2/module.hxx | 4
sfx2/inc/sfx2/newstyle.hxx | 2
sfx2/inc/sfx2/objface.hxx | 4
sfx2/inc/sfx2/objsh.hxx | 18 -
sfx2/inc/sfx2/prnmon.hxx | 29 --
sfx2/inc/sfx2/progress.hxx | 2
sfx2/inc/sfx2/request.hxx | 2
sfx2/inc/sfx2/sfxbasecontroller.hxx | 2
sfx2/inc/sfx2/styfitem.hxx | 4
sfx2/inc/sfx2/styledlg.hxx | 2
sfx2/inc/sfx2/tabdlg.hxx | 4
sfx2/inc/sfx2/tbxctrl.hxx | 6
sfx2/inc/sfx2/unoctitm.hxx | 2
sfx2/inc/sfx2/viewfrm.hxx | 2
sfx2/source/appl/appcfg.cxx | 11
sfx2/source/appl/appuno.cxx | 18 -
sfx2/source/appl/childwin.cxx | 37 ---
sfx2/source/appl/workwin.cxx | 10
sfx2/source/control/msgpool.cxx | 20 -
sfx2/source/doc/DocumentMetadataAccess.cxx | 11
sfx2/source/doc/Metadatable.cxx | 13 -
sfx2/source/doc/SfxDocumentMetaData.cxx | 22 -
sfx2/source/doc/docfile.cxx | 12 -
sfx2/source/doc/doctempl.cxx | 15 -
sfx2/source/doc/objmisc.cxx | 11
sfx2/source/doc/objstor.cxx | 56 -----
sfx2/source/doc/objxtor.cxx | 16 -
sfx2/source/doc/sfxbasemodel.cxx | 14 -
sfx2/source/layout/sfxtabpage.cxx | 23 --
sfx2/source/notify/hintpost.cxx | 8
sfx2/source/view/prnmon.cxx | 7
sfx2/source/view/viewprn.cxx | 42 ---
svx/inc/svx/colrctrl.hxx | 2
svx/inc/svx/contdlg.hxx | 3
svx/inc/svx/fillctrl.hxx | 2
svx/inc/svx/fntctl.hxx | 2
svx/inc/svx/fntszctl.hxx | 2
svx/inc/svx/graphctl.hxx | 3
svx/inc/svx/ruler.hxx | 2
svx/inc/svx/svdetc.hxx | 4
svx/inc/svx/svdmodel.hxx | 4
svx/inc/svx/svdpage.hxx | 2
svx/source/dialog/framelink.cxx | 38 ---
svx/source/items/numfmtsh.cxx | 3
svx/source/svdraw/svdedtv1.cxx | 14 -
ucb/source/ucp/hierarchy/hierarchycontent.cxx | 6
ucb/source/ucp/hierarchy/hierarchydata.cxx | 33 --
ucb/source/ucp/hierarchy/hierarchyprovider.cxx | 12 -
ucb/source/ucp/odma/odma_content.cxx | 85 -------
ucb/source/ucp/odma/odma_provider.cxx | 13 -
ucb/source/ucp/package/pkgcontent.cxx | 6
ucb/source/ucp/tdoc/tdoc_content.cxx | 7
ucb/source/ucp/webdav/NeonSession.cxx | 9
ucb/source/ucp/webdav/webdavcontent.cxx | 21 -
ucb/workben/ucb/ucbdemo.cxx | 44 ---
uui/source/iahndl.cxx | 111 ----------
uui/source/iahndl.hxx | 12 -
xmloff/source/core/xmlexp.cxx | 26 --
xmloff/source/meta/MetaExportComponent.cxx | 13 -
xmloff/source/style/styleexp.cxx | 26 --
xmloff/source/style/xmlnumfi.cxx | 87 -------
104 files changed, 19 insertions(+), 1783 deletions(-)
New commits:
commit 6a007ed1754b45ab00c3021dc3724edea53f1ed1
Author: Povilas Kanapickas <povilas.kanapickas at gmail.com>
Date: Mon Oct 18 19:37:48 2010 +0100
remove non-compiled code
diff --git a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
index 9047cbf..80f22f5 100644
--- a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
@@ -316,28 +316,6 @@ sal_Bool lcl_IsEmptyOrHidden( const Reference<XSpreadsheets>& xSheets, const ::r
return sal_True; // hidden
}
-#if 0
- // test if whole sheet is empty
-
- Reference<XCellRangeAddressable> xAddr( xSheet, UNO_QUERY );
- Reference<XCellRangesQuery> xQuery( xSheet, UNO_QUERY );
- if ( xAddr.is() && xQuery.is() )
- {
- CellRangeAddress aTotalRange = xAddr->getRangeAddress();
- // queryIntersection to get a ranges object
- Reference<XSheetCellRanges> xRanges = xQuery->queryIntersection( aTotalRange );
- if (xRanges.is())
- {
- Reference<XEnumerationAccess> xCells = xRanges->getCells();
- if (xCells.is())
- {
- if ( !xCells->hasElements() )
- return sal_True; // empty
- }
- }
- }
-#endif
-
// use the same data area as in OCalcTable to test for empty table
Reference<XSheetCellCursor> xCursor = xSheet->createCursor();
diff --git a/connectivity/source/drivers/hsqldb/HConnection.cxx b/connectivity/source/drivers/hsqldb/HConnection.cxx
index 7a0eabe..543e6b3 100644
--- a/connectivity/source/drivers/hsqldb/HConnection.cxx
+++ b/connectivity/source/drivers/hsqldb/HConnection.cxx
@@ -281,44 +281,6 @@ namespace connectivity { namespace hsqldb
}
//TODO: resource
-#if 0
- // -------------------------------------------------------------------
- Reference< XExecutableDialog > OHsqlConnection::impl_createLinkedTableEditor_throw( const Reference< XDatabaseDocumentUI >& _rxDocumentUI, const ::rtl::OUString& _rTableName )
- {
- OSL_PRECOND( _rxDocumentUI.is(), "OHsqlConnection::impl_createLinkedTableEditor_throw: illegal document UI!" );
- Reference< XExecutableDialog > xDialog;
- try
- {
- ::comphelper::ComponentContext aContext( m_xORB );
- Sequence< Any > aArguments(3);
- aArguments[0] <<= NamedValue(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TableContainer" ) ),
- makeAny( impl_getTableContainer_throw() )
- );
- aArguments[1] <<= NamedValue(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TableName" ) ),
- makeAny( _rTableName )
- );
- aArguments[2] <<= NamedValue(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ParentWindow" ) ),
- makeAny( _rxDocumentUI->getApplicationMainWindow() )
- );
-
- aContext.createComponentWithArguments( "com.sun.star.sdb.hsql.LinkedTableEditor", aArguments, xDialog );
- if ( !xDialog.is() )
- throw ServiceNotRegisteredException( ::rtl::OUString::createFromAscii( "com.sun.star.sdb.hsql.LinkedTableEditor" ), *this );
- }
- catch( const RuntimeException& ) { throw; }
- catch( const Exception& )
- {
- ::connectivity::SharedResources aResources;
- const ::rtl::OUString sError( aResources.getResourceString(STR_NO_TABLE_EDITOR_DIALOG));
- throw WrappedTargetException( sError ,*this, ::cppu::getCaughtException() );
- }
- return xDialog;
- }
-#endif
-
// -------------------------------------------------------------------
void OHsqlConnection::impl_checkExistingTable_throw( const ::rtl::OUString& _rTableName )
{
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx
index 0a47bac..6e4d758 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx
@@ -129,13 +129,6 @@ char *MTypeConverter::nsStringToCCharStringAscii(nsString const &nss)
::rtl::OString os(ous,ous.getLength(),RTL_TEXTENCODING_ASCII_US);
return( ::std::string(os.getStr()));
}
-#if 0
-// -------------------------------------------------------------------------
-::std::string MTypeConverter::nsStringToStlString(nsString const &nss)
-{
- return( ::std::string(nss.GetBuffer()));
-}
-#endif
// -------------------------------------------------------------------------
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/dbase/DIndexPage.hxx b/connectivity/source/inc/dbase/DIndexPage.hxx
index a4dc680..7e9b5ba 100644
--- a/connectivity/source/inc/dbase/DIndexPage.hxx
+++ b/connectivity/source/inc/dbase/DIndexPage.hxx
@@ -34,47 +34,5 @@
#include <vector>
#endif
-#if 0
-namespace connectivity
-{
- namespace dbase
- {
- //==================================================================
- // Index Seitenverweis
- //==================================================================
- // SV_DECL_REF(ONDXPage); // Basisklasse da weitere Informationen gehalten werden muessen
-
- class ONDXPage;
- typedef vos::ORef<ONDXPage> ONDXPagePtr_BASE;
-
- class ONDXPagePtr : public ONDXPagePtr_BASE //ONDXPageRef
- {
- friend SvStream& operator << (SvStream &rStream, const ONDXPagePtr&);
- friend SvStream& operator >> (SvStream &rStream, ONDXPagePtr&);
-
- UINT32 nPagePos; // Position in der Indexdatei
-
- public:
- ONDXPagePtr(UINT32 nPos = 0):nPagePos(nPos){}
- ONDXPagePtr(const ONDXPagePtr& rRef);
- ONDXPagePtr(ONDXPage* pRefPage);
-
- ONDXPagePtr& operator=(const ONDXPagePtr& rRef);
- ONDXPagePtr& operator=(ONDXPage* pPageRef);
-
- UINT32 GetPagePos() const {return nPagePos;}
- BOOL HasPage() const {return nPagePos != 0;}
- sal_Bool Is() const { return isValid(); }
- void Clear()
- {
- unbind();
- }
- };
-
- SvStream& operator << (SvStream &rStream, const ONDXPagePtr&);
- SvStream& operator >> (SvStream &rStream, ONDXPagePtr&);
- }
-}
-#endif
#endif // _CONNECTIVITY_DBASE_INDEXPAGE_HXX_
diff --git a/connectivity/source/inc/hsqldb/HConnection.hxx b/connectivity/source/inc/hsqldb/HConnection.hxx
index 2cb6cd5..ef101db 100644
--- a/connectivity/source/inc/hsqldb/HConnection.hxx
+++ b/connectivity/source/inc/hsqldb/HConnection.hxx
@@ -103,35 +103,6 @@ namespace connectivity
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getTableEditor( const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::application::XDatabaseDocumentUI >& DocumentUI, const ::rtl::OUString& TableName ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
private:
-#if 0
- // TODO: resource
- /** creates the dialog used for editing a linked table
-
- @param _rTableName
- the name of the table to create the editor for.
-
- @param _rxDocumentUI
- the UI of the database document, for which the editor is to be created.
- Must not be <NULL/>.
-
- @return
- the table editor dialog instance.
-
- @throws ::com::sun::star::lang::WrappedTargetException
- if creating the dialog instance fails
-
- @throws ::com::sun::star::uno::RuntimeException
- if a serious error occures
-
- @precond
- Our mutex is locked.
- */
- ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XExecutableDialog >
- impl_createLinkedTableEditor_throw(
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::application::XDatabaseDocumentUI >& _rxDocumentUI,
- const ::rtl::OUString& _rTableName
- );
-#endif
/** retrieves our table container
@return
diff --git a/desktop/os2/source/applauncher/launcher.cxx b/desktop/os2/source/applauncher/launcher.cxx
index d814a59..33bd34a 100644
--- a/desktop/os2/source/applauncher/launcher.cxx
+++ b/desktop/os2/source/applauncher/launcher.cxx
@@ -67,11 +67,7 @@ int main( int argc, char* argv[])
DosSetExtLIBPATH( (PCSZ)szLibpath, BEGIN_LIBPATH);
// make sure we load DLL from our path only, so multiple instances/versions
// can be loaded.
-#if 0
- // YD this feature is not compatible with innowin b20,
- // java cannot load with this flag enabled
- DosSetExtLIBPATH( (PCSZ)"T", LIBPATHSTRICT);
-#endif
+
// adjust exe name
_splitpath( szApplicationName, szDrive, szDir, szFileName, szExt );
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index 6ba69fa..b2f12c2 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -151,28 +151,7 @@ static bool configureUcb(bool bServer, rtl::OUString const & rPortalConnect)
{
Reference<XContentProviderManager> xCPM =
cb->getContentProviderManagerInterface();
-#if 0
- try
- {
- Reference<XContentProviderFactory> xCPF(
- xServiceFactory->createInstance(
- rtl::OUString::createFromAscii(
- "com.sun.star.ucb.ContentProviderProxyFactory")),
- UNO_QUERY);
- if(xCPF.is())
- xCPM->registerContentProvider(
- xCPF->createContentProvider(
- rtl::OUString::createFromAscii(
- "com.sun.star.ucb.GnomeVFSContentProvider"
- )
- ),
- rtl::OUString::createFromAscii(".*"),
- false);
- } catch (...)
- {
- }
-#else
// Workaround for P1 #124597#. Instanciate GNOME-VFS-UCP in the thread that initialized
// GNOME in order to avoid a deadlock that may occure in case UCP gets initialized from
@@ -195,7 +174,6 @@ static bool configureUcb(bool bServer, rtl::OUString const & rPortalConnect)
{
}
}
-#endif
}
} catch (RuntimeException e) {
}
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index 3965a81..d035546 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -261,9 +261,7 @@ private:
virtual ~Thread();
virtual void execute();
-#if 0
- void handleGeneralError(css::uno::Any const & exception) const;
-#endif
+
void handleSpecificError(
css::uno::Reference< css::deployment::XPackage > const & package,
css::uno::Any const & exception) const;
@@ -452,21 +450,7 @@ void UpdateDialog::Thread::execute()
m_dialog.checkingDone();
}
}
-#if 0
-void UpdateDialog::Thread::handleGeneralError(css::uno::Any const & exception)
- const
-{
- rtl::OUString message;
- css::uno::Exception e;
- if (exception >>= e) {
- message = e.Message;
- }
- vos::OGuard g(Application::GetSolarMutex());
- if (!m_stop) {
- m_dialog.addGeneralError(message);
- }
-}
-#endif
+
//Parameter package can be null
void UpdateDialog::Thread::handleSpecificError(
css::uno::Reference< css::deployment::XPackage > const & package,
@@ -772,18 +756,7 @@ void UpdateDialog::addDisabledUpdate(UpdateDialog::DisabledUpdate const & data)
SvLBoxButtonKind_disabledCheckbox);
// position overflow is rather harmless
}
-#if 0
-void UpdateDialog::addGeneralError(rtl::OUString const & message) {
- std::vector< rtl::OUString >::size_type n = m_generalErrors.size();
- m_generalErrors.push_back(message);
- addAdditional(
- m_error,
- sal::static_int_cast< USHORT >(
- m_enabledUpdates.size() + m_disabledUpdates.size() + n),
- UpdateDialog::Index::newGeneralError(n), SvLBoxButtonKind_staticImage);
- // position overflow is rather harmless
-}
-#endif
+
void UpdateDialog::addSpecificError(UpdateDialog::SpecificError const & data) {
std::vector< UpdateDialog::SpecificError >::size_type n =
m_specificErrors.size();
@@ -1245,15 +1218,6 @@ IMPL_LINK(UpdateDialog, okHandler, void *, EMPTYARG)
//If the user has no write access to the shared folder then the update
//for a shared extension is disable, that is it cannot be in m_enabledUpdates
// OSL_ASSERT(isReadOnly(i->aInstalledPackage) == sal_False);
-#if 0
- // TODO: check!
- OSL_ASSERT(m_extensionManagerDialog.get());
- if (RET_CANCEL == m_extensionManagerDialog->continueUpdateForSharedExtension(
- this, i->aPackageManager))
- {
- EndDialog(RET_CANCEL);
- }
-#endif
}
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
index dc1ed8f..89980ef 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
@@ -158,9 +158,6 @@ private:
rtl::OUString const & name, dp_gui::UpdateData const & data);
void addDisabledUpdate(UpdateDialog::DisabledUpdate const & data);
-#if 0
- void addGeneralError(rtl::OUString const & message);
-#endif
void addSpecificError(UpdateDialog::SpecificError const & data);
void checkingDone();
diff --git a/editeng/inc/editeng/editeng.hxx b/editeng/inc/editeng/editeng.hxx
index dd6fa3b..a23a03c 100644
--- a/editeng/inc/editeng/editeng.hxx
+++ b/editeng/inc/editeng/editeng.hxx
@@ -121,10 +121,7 @@ private:
EDITENG_DLLPRIVATE EditEngine( const EditEngine& );
EDITENG_DLLPRIVATE EditEngine& operator=( const EditEngine& );
-
-//#if 0 // _SOLAR__PRIVATE
EDITENG_DLLPRIVATE BOOL PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pView, Window* pFrameWin = NULL );
-//#endif
protected:
diff --git a/editeng/inc/editeng/outliner.hxx b/editeng/inc/editeng/outliner.hxx
index 1134188..3ec6f67 100644
--- a/editeng/inc/editeng/outliner.hxx
+++ b/editeng/inc/editeng/outliner.hxx
@@ -395,11 +395,7 @@ bool EDITENG_DLLPUBLIC GetStatusValueForThesaurusFromContext( String &rStatusVa
void EDITENG_DLLPUBLIC ReplaceTextWithSynonym( EditView &rEditView, const String &rSynonmText );
-//#if 0 // _SOLAR__PRIVATE
DECLARE_LIST(ViewList,OutlinerView*)
-//#else
-//typedef List ViewList;
-//#endif
class EDITENG_DLLPUBLIC DrawPortionInfo
{
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index 0677f01..d5214dd 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -312,34 +312,6 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
pAkt->nStyleNo = USHORT( nStyleNo );
-#if 0
-// JP 05.09.95: zuruecksetzen der Style-Attribute fuehrt nur zu Problemen.
-// Es muss reichen, wenn das ueber pard/plain erfolgt
-// ansonsten Bugdoc 15304.rtf - nach nur "\pard" falscher Font !!
-
- SvxRTFStyleType* pStyle = aStyleTbl.Get( pAkt->nStyleNo );
- if( pStyle && pStyle->aAttrSet.Count() )
- {
- //JP 07.07.95:
- // alle Attribute, die in der Vorlage gesetzt werden
- // auf defaults setzen. In RTF werden die Attribute
- // der Vorlage danach ja wiederholt.
- // WICHTIG: Attribute die in der Vorlage definiert
- // sind, werden zurueckgesetzt !!!!
- // pAkt->aAttrSet.Put( pStyle->aAttrSet );
-
- SfxItemIter aIter( pStyle->aAttrSet );
- SfxItemPool* pPool = pStyle->aAttrSet.GetPool();
- USHORT nWh = aIter.GetCurItem()->Which();
- while( TRUE )
- {
- pAkt->aAttrSet.Put( pPool->GetDefaultItem( nWh ));
- if( aIter.IsAtEnd() )
- break;
- nWh = aIter.NextItem()->Which();
- }
- }
-#endif
}
break;
@@ -991,17 +963,9 @@ ATTR_SETOVERLINE:
PLAINID->nColor ));
}
break;
-#if 0
//#i12501# While cb is clearly documented in the rtf spec, word
//doesn't accept it at all
- case RTF_CB:
- if( PLAINID->nBgColor )
- {
- pSet->Put( SvxBrushItem( GetColor( USHORT(nTokenValue) ),
- PLAINID->nBgColor ));
- }
- break;
-#endif
+
case RTF_LANG:
if( PLAINID->nLanguage )
{
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index e179c2e..462374b 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -183,13 +183,8 @@ void SvxRTFParser::Continue( int nToken )
if( SVPAR_PENDING != GetStatus() )
{
SetAllAttrOfStk();
-#if 0
//Regardless of what "color 0" is, word defaults to auto as the default colour.
//e.g. see #i7713#
- if( bNewDoc && ((RTFPlainAttrMapIds*)aPlainMap.GetData())->nColor )
- pAttrPool->SetPoolDefaultItem( SvxColorItem( GetColor( 0 ),
- ((RTFPlainAttrMapIds*)aPlainMap.GetData())->nColor ));
-#endif
}
}
@@ -296,10 +291,7 @@ INSINGLECHAR:
case RTF_TC:
case RTF_NEXTFILE:
case RTF_TEMPLATE:
-#if 0
- //disabled for #i19718#
- case RTF_SHPRSLT: // RTF_SHP fehlt noch !!
-#endif
+ // RTF_SHPRSLT disabled for #i19718#
SkipGroup();
break;
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -443,9 +435,6 @@ void SvxRTFParser::ReadStyleTable()
if( '{' == GetStackPtr( -1 )->nTokenId )
{
nToken = SkipToken( -1 );
-#if 0
- --_nOpenBrakets; // korrigieren!!
-#endif
}
}
ReadAttr( nToken, &pStyle->aAttrSet );
@@ -988,12 +977,6 @@ void SvxRTFParser::AttrGroupEnd() // den akt. Bearbeiten, vom Stack loeschen
if( ( pOld->pSttNd->GetIdx() < pInsPos->GetNodeIdx() ||
( pOld->pSttNd->GetIdx() == pInsPos->GetNodeIdx() &&
pOld->nSttCnt <= pInsPos->GetCntIdx() ))
-#if 0
-//BUG 68555 - dont test for empty paragraph or any range
- && ( nOldSttNdIdx != pInsPos->GetNodeIdx() ||
- pOld->nSttCnt != pInsPos->GetCntIdx() ||
- !pOld->nSttCnt )
-#endif
)
{
if( !bCrsrBack )
@@ -1002,25 +985,6 @@ void SvxRTFParser::AttrGroupEnd() // den akt. Bearbeiten, vom Stack loeschen
// Absatz !!
if( nOldSttNdIdx == pInsPos->GetNodeIdx() )
{
-#if 0
-//BUG 68555 - dont reset pard attrs, if the group not begins not at start of
-// paragraph
- // Bereich innerhalb eines Absatzes:
- // alle Absatz-Attribute und StyleNo loeschen
- // aber nur wenn mitten drin angefangen wurde
- if( pOld->nSttCnt )
- {
- pOld->nStyleNo = 0;
- for( USHORT n = 0; n < aPardMap.Count() &&
- pOld->aAttrSet.Count(); ++n )
- if( aPardMap[n] )
- pOld->aAttrSet.ClearItem( aPardMap[n] );
-
- if( !pOld->aAttrSet.Count() && !pOld->pChildList &&
- !pOld->nStyleNo )
- break; // auch dieser verlaesst uns jetzt
- }
-#endif
}
else
{
@@ -1079,10 +1043,6 @@ void SvxRTFParser::AttrGroupEnd() // den akt. Bearbeiten, vom Stack loeschen
pOld->pEndNd = pInsPos->MakeNodeIdx();
pOld->nEndCnt = pInsPos->GetCntIdx();
-#if 0
- if( IsChkStyleAttr() )
- _ClearStyleAttr( *pOld );
-#else
/*
#i21422#
If the parent (pAkt) sets something e.g. , and the child (pOld)
@@ -1095,7 +1055,6 @@ void SvxRTFParser::AttrGroupEnd() // den akt. Bearbeiten, vom Stack loeschen
*/
if (IsChkStyleAttr() && !pAkt)
_ClearStyleAttr( *pOld );
-#endif
if( pAkt )
{
@@ -1291,18 +1250,6 @@ void SvxRTFItemStackType::Add( SvxRTFItemStackType* pIns )
pChildList->Insert( pIns, pChildList->Count() );
}
-#if 0
-//cmc: This is the original. nEndCnt is redundantly assigned to itself, and
-//pEndNd can leak if not equal to pSttNd.
-void SvxRTFItemStackType::SetStartPos( const SvxPosition& rPos )
-{
- delete pSttNd;
- pSttNd = rPos.MakeNodeIdx();
- nSttCnt = rPos.GetCntIdx();
- pEndNd = pSttNd;
- nEndCnt = nEndCnt;
-}
-#else
void SvxRTFItemStackType::SetStartPos( const SvxPosition& rPos )
{
if (pSttNd != pEndNd)
@@ -1312,7 +1259,6 @@ void SvxRTFItemStackType::SetStartPos( const SvxPosition& rPos )
pEndNd = pSttNd;
nSttCnt = rPos.GetCntIdx();
}
-#endif
void SvxRTFItemStackType::MoveFullNode(const SvxNodeIdx &rOldNode,
const SvxNodeIdx &rNewNode)
diff --git a/embeddedobj/source/commonembedding/persistence.cxx b/embeddedobj/source/commonembedding/persistence.cxx
index 6d2443a..88e537f 100644
--- a/embeddedobj/source/commonembedding/persistence.cxx
+++ b/embeddedobj/source/commonembedding/persistence.cxx
@@ -1795,14 +1795,11 @@ void SAL_CALL OCommonEmbeddedObject::breakLink( const uno::Reference< embed::XSt
::rtl::OUString::createFromAscii( "The object is not a valid linked object!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
}
-#if 0
else
{
// the current implementation of OOo links does not implement this method since it does not implement
// all the set of interfaces required for OOo embedded object ( XEmbedPersist is not supported ).
- throw io::IOException(); // TODO:
}
-#endif
if ( !xStorage.is() )
throw lang::IllegalArgumentException( ::rtl::OUString::createFromAscii( "No parent storage is provided!\n" ),
diff --git a/embeddedobj/source/commonembedding/xfactory.cxx b/embeddedobj/source/commonembedding/xfactory.cxx
index f96cabf..a6b80ec 100644
--- a/embeddedobj/source/commonembedding/xfactory.cxx
+++ b/embeddedobj/source/commonembedding/xfactory.cxx
@@ -130,18 +130,6 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta
}
xSubStorage = uno::Reference< embed::XStorage >();
-#if 0
- ::rtl::OUString aDocServiceName = m_aConfigHelper.GetDocumentServiceFromMediaType( aMediaType );
- if ( !aDocServiceName.getLength() )
- {
- // only own document can be based on storage
- // in case it is not possible to find related
- // document service name the storage entry is invalid
-
- throw io::IOException(); // unexpected mimetype of the storage
- }
-#endif
-
uno::Sequence< beans::NamedValue > aObject = m_aConfigHelper.GetObjectPropsByMediaType( aMediaType );
if ( !aObject.getLength() )
throw io::IOException(); // unexpected mimetype of the storage
@@ -150,11 +138,6 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta
static_cast< ::cppu::OWeakObject* > ( new OCommonEmbeddedObject(
m_xFactory,
aObject ) ),
-#if 0
- GetClassIDFromServName( aDocServiceName ),
- GetClassNameFromServName( aDocServiceName ),
- aDocServiceName ) ),
-#endif
uno::UNO_QUERY );
}
else
diff --git a/embeddedobj/test/Container1/nativelib/nativeview.c b/embeddedobj/test/Container1/nativelib/nativeview.c
index bb9a795..64137f2 100644
--- a/embeddedobj/test/Container1/nativelib/nativeview.c
+++ b/embeddedobj/test/Container1/nativelib/nativeview.c
@@ -79,10 +79,6 @@ JNIEXPORT jlong JNICALL Java_embeddedobj_test_NativeView_getNativeWindow
JAWT_Win32DrawingSurfaceInfo* dsi_win ;
jlong drawable;
-#if 0
- LONG hFuncPtr;
-#endif
-
/* Get the AWT */
awt.version = JAWT_VERSION_1_3;
result = JAWT_GetAWT(env, &awt);
@@ -115,72 +111,6 @@ JNIEXPORT jlong JNICALL Java_embeddedobj_test_NativeView_getNativeWindow
/* Free the drawing surface */
awt.FreeDrawingSurface(ds);
-#if 0
- /* Register own window procedure
- Do it one times only! Otherwhise
- multiple instances will be registered
- and calls on such construct produce
- a stack overflow.
- */
-
- if (GetProp( (HWND)drawable, OLD_PROC_KEY )==0)
- {
- hFuncPtr = SetWindowLong( (HWND)drawable, GWL_WNDPROC, (DWORD)NativeViewWndProc );
- SetProp( (HWND)drawable, OLD_PROC_KEY, (HANDLE)hFuncPtr );
- }
-#endif
-
return drawable;
}
-#if 0
-/*****************************************************************************
- *
- * Class : -
- * Method : NativeViewWndProc
- * Signature : -
- * Description: registered window handler to intercept window messages between
- * java and office process
- */
-static LRESULT APIENTRY NativeViewWndProc(
- HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
- HANDLE hFuncPtr;
-
- /* resize new created child window to fill out the java window complete */
- if (uMsg==WM_PARENTNOTIFY)
- {
- if (wParam == WM_CREATE)
- {
- RECT rect;
- HWND hChild = (HWND) lParam;
-
- GetClientRect(hWnd, &rect);
-
- SetWindowPos(hChild,
- NULL,
- rect.left,
- rect.top,
- rect.right - rect.left,
- rect.bottom - rect.top,
- SWP_NOZORDER);
- }
- }
- /* handle normal resize events */
- else if(uMsg==WM_SIZE)
- {
- WORD newHeight = HIWORD(lParam);
- WORD newWidth = LOWORD(lParam);
- HWND hChild = GetWindow(hWnd, GW_CHILD);
-
- if (hChild != NULL)
- SetWindowPos(hChild, NULL, 0, 0, newWidth, newHeight, SWP_NOZORDER);
- }
-
- /* forward request to original handler which is intercepted by this window procedure */
- hFuncPtr = GetProp(hWnd, OLD_PROC_KEY);
- MY_ASSERT(hFuncPtr,"lost original window proc handler");
- return CallWindowProc( hFuncPtr, hWnd, uMsg, wParam, lParam);
-}
-#endif
-
diff --git a/fileaccess/source/FileAccess.cxx b/fileaccess/source/FileAccess.cxx
index e21abdb..7cbce15 100644
--- a/fileaccess/source/FileAccess.cxx
+++ b/fileaccess/source/FileAccess.cxx
@@ -282,42 +282,7 @@ void OFileAccess::transferImpl( const rtl::OUString& rSource,
// #i29648#
//
-#if 0
- // Note: A hierachical UCB content implements interface XChild, which
- // has a method getParent(). Unfortunately this does not always help
- // here, because it is not guaranteed that a content object for a
- // non-existing resource can be created. Thus, it will happen that an
- // exception is thrown when trying to create a UCB content for the
- // destination URL.
- try
- {
- ucbhelper::Content aFullDest(
- aDestObj.GetMainURL(
- INetURLObject::NO_DECODE ), mxEnvironment );
-
- Reference< XChild > xChild( aFullDest.get(), UNO_QUERY_THROW );
- Reference< com::sun::star::ucb::XContent >
- xParent( xChild->getParent(), UNO_QUERY_THROW );
- ucbhelper::Content aParent( xParent, mxEnvironment );
-
- aDestURL = aParent.getURL();
-
- rtl::OUString aNameTmp;
- aFullDest.getPropertyValue(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) ) )
- >>= aNameTmp;
- aName = aNameTmp;
- }
- catch ( Exception const & )
- {
- throw RuntimeException(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- "OFileAccess::transferrImpl - Unable to "
- "obtain destination folder URL!" ) ),
- static_cast< cppu::OWeakObject * >( this ) );
- }
-#else
if ( aDestObj.GetProtocol() == INET_PROT_VND_SUN_STAR_EXPAND )
{
// Hack: Expand destination URL using Macro Expander and try again
@@ -368,7 +333,7 @@ void OFileAccess::transferImpl( const rtl::OUString& rSource,
"OFileAccess::transferrImpl - Unable to obtain "
"destination folder URL!" ) ),
static_cast< cppu::OWeakObject * >( this ) );
-#endif
+
}
ucbhelper::Content aDestPath( aDestURL, mxEnvironment );
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx
index e410dfd..76b9bba 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -644,23 +644,6 @@ const String& FormulaCompiler::GetNativeSymbol( OpCode eOp )
// -----------------------------------------------------------------------------
void FormulaCompiler::InitSymbolsNative() const
{
-#if 0 // No point in keeping this since you can now do this from the UI.
- if (mxSymbolsNative.get())
- return;
- //! Experimental!
- // Use English function names and separators instead of native in UI.
- static const sal_Char aEnvVarName[] = "OOO_CALC_USE_ENGLISH_FORMULAS";
- const char* pEnv = getenv( aEnvVarName);
- if (pEnv && (*pEnv == 'Y' || *pEnv == 'y' || *pEnv == '1') )
- {
- fprintf( stderr, "%s=%s => UI uses English function names and separators in formulas.\n",
- aEnvVarName, pEnv);
- InitSymbolsEnglish();
- mxSymbolsNative = mxSymbolsEnglish;
- return;
- }
-#endif
-
lcl_fillNativeSymbols(mxSymbolsNative);
}
// -----------------------------------------------------------------------------
diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx
index 8971dc8..8d9a5f8 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -893,19 +893,6 @@ BOOL FormulaTokenArray::HasMatrixDoubleRefOps()
// --- POF (plain old formula) rewrite of a token array ---------------------
-#if 0
-// static function can't be compiled if not used (warning)
-//#if OSL_DEBUG_LEVEL > 0
-static void DumpTokArr( FormulaTokenArray *pCode )
-{
- fprintf (stderr, "TokenArr: ");
- for ( FormulaToken *pCur = pCode->First(); pCur; pCur = pCode->Next() )
- fprintf( stderr, "t%d,o%d ",
- pCur->GetType(), pCur->GetOpCode() );
- fprintf (stderr, "\n");
-}
-#endif
-
inline bool MissingConvention::isRewriteNeeded( OpCode eOp ) const
{
switch (eOp)
diff --git a/fpicker/source/unx/gnome/SalGtkFolderPicker.hxx b/fpicker/source/unx/gnome/SalGtkFolderPicker.hxx
index 39bd7cb..7fe3d33 100644
--- a/fpicker/source/unx/gnome/SalGtkFolderPicker.hxx
+++ b/fpicker/source/unx/gnome/SalGtkFolderPicker.hxx
@@ -119,11 +119,6 @@ class SalGtkFolderPicker :
private:
// to instanciate own services
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceMgr;
-
-#if 0
- public:
- virtual ~SalGtkFolderPicker();
-#endif
};
#endif // _SALGTKFOLDERPICKER_HXX_
diff --git a/framework/inc/classes/menumanager.hxx b/framework/inc/classes/menumanager.hxx
index f422847..a8bfeec 100644
--- a/framework/inc/classes/menumanager.hxx
+++ b/framework/inc/classes/menumanager.hxx
@@ -82,14 +82,6 @@ class MenuManager : public ThreadHelpBase ,
Menu* pMenu,
sal_Bool bDelete,
sal_Bool bDeleteChildren );
-#if 0
- MenuManager(
- const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
- REFERENCE< XFRAME >& rFrame,
- AddonMenu* pAddonMenu,
- sal_Bool bDelete,
- sal_Bool bDeleteChildren );
-#endif
virtual ~MenuManager();
diff --git a/framework/inc/services/license.hxx b/framework/inc/services/license.hxx
index 0d4f873..2ebc226 100644
--- a/framework/inc/services/license.hxx
+++ b/framework/inc/services/license.hxx
@@ -88,10 +88,6 @@ namespace framework
FWK_DECLARE_XTYPEPROVIDER
DECLARE_XSERVICEINFO
-#if 0
- DECL_STATIC_LINK( License, Terminate, void* );
-#endif
-
/*
XJob...
any execute([in] sequence< ::com::sun::star::beans::NamedValue > Arguments )
diff --git a/framework/source/application/framework.cxx b/framework/source/application/framework.cxx
index 5888ed0..2bdb3ab 100644
--- a/framework/source/application/framework.cxx
+++ b/framework/source/application/framework.cxx
@@ -219,28 +219,6 @@ void FrameWork::Main()
// c) Initialize connection to possible PlugIn dll.
// OPipeConnection removed, connection to plugin now uses acceptor service
-#if 0
- if ( m_bUsePlugIn == sal_True )
- {
- Reference< XConnection > xConnection = new OPipeConnection( xGlobalServiceManager );
- Reference< XBridgeFactory > xBridgeFactory ( xGlobalServiceManager->createInstance( SERVICENAME_BRIDGEFACTORY ), UNO_QUERY );
- if (
- ( xConnection.is() == sal_True ) &&
- ( xBridgeFactory.is() == sal_True )
- )
- {
- Reference< XBridge > xBridge = xBridgeFactory->createBridge( NAME_PLUGINBRIDGE ,
- PROTOCOL_PLUGINBRIDGE ,
- xConnection ,
- new OInstanceProvider( xGlobalServiceManager ) );
- }
- else
- {
- // Error handling ... !?
- LOG_ASSERT( sal_False, "FrameWork::Main()\nNo connection to plugin. Initialization of bridge failed.\n" )
- }
- }
-#endif
//---------------------------------------------------------------------------------------------------------
// d) Initialize new task with a HTML-URL in it.
diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx
index e47ec06..43f3dde 100644
--- a/framework/source/classes/menumanager.cxx
+++ b/framework/source/classes/menumanager.cxx
@@ -157,9 +157,7 @@ MenuManager::MenuManager(
m_bShowMenuImages = rSettings.GetUseImagesInMenus();
sal_Int32 nAddonsURLPrefixLength = ADDONSPOPUPMENU_URL_PREFIX.getLength();
-#if 0
- ::std::vector< USHORT > aQueryLabelItemIdVector;
-#endif
+
USHORT nItemCount = pMenu->GetItemCount();
m_aMenuItemHandlerVector.reserve(nItemCount);
@@ -185,10 +183,6 @@ MenuManager::MenuManager(
{
// #110897#
// MenuManager* pSubMenuManager = new MenuManager( rFrame, pPopupMenu, bDeleteChildren, bDeleteChildren );
-#if 0
- if ( pMenu->GetItemText( nItemId ).Len() == 0 )
- aQueryLabelItemIdVector.push_back( nItemId );
-#endif
// Create addon popup menu if there exist elements and this is the tools popup menu
if (( nItemId == SID_ADDONLIST ||
@@ -216,10 +210,6 @@ MenuManager::MenuManager(
// #110897#
// MenuManager* pSubMenuManager = new MenuManager( rFrame, pSubMenu, sal_True, sal_False );
AddMenu(pSubMenu,::rtl::OUString(),nItemId,sal_True,sal_False);
-#if 0
- if ( pMenu->GetItemText( nItemId ).Len() == 0 )
- aQueryLabelItemIdVector.push_back( nItemId );
-#endif
// Set image for the addon popup menu item
if ( bShowMenuImages && !pPopupMenu->GetItemImage( ITEMID_ADDONLIST ))
{
@@ -248,11 +238,6 @@ MenuManager::MenuManager(
// #110897#
// MenuManager* pSubMenuManager = new MenuManager( rFrame, pSubMenu, sal_True, sal_False );
AddMenu(pSubMenu,::rtl::OUString(),nItemId,sal_True,sal_False);
-#if 0
- if ( pMenu->GetItemText( nItemId ).Len() == 0 )
- aQueryLabelItemIdVector.push_back( nItemId );
-#endif
-
if ( bShowMenuImages && !pMenu->GetItemImage( nItemId ))
{
Image aImage = GetImageFromURL( rFrame, aItemCommand, FALSE, m_bWasHiContrast );
@@ -273,10 +258,7 @@ MenuManager::MenuManager(
// #110897#
// MenuManager* pSubMenuManager = new MenuManager( rFrame, pSubMenu, sal_True, sal_False );
AddMenu(pSubMenu,::rtl::OUString(),nItemId,sal_True,sal_False);
-#if 0
- if ( pMenu->GetItemText( nItemId ).Len() == 0 )
- aQueryLabelItemIdVector.push_back( nItemId );
-#endif
+
if ( bShowMenuImages && !pMenu->GetItemImage( nItemId ))
{
@@ -324,98 +306,17 @@ MenuManager::MenuManager(
REFERENCE< XDISPATCH > aXDispatchRef;
m_aMenuItemHandlerVector.push_back( new MenuItemHandler( nItemId, NULL, aXDispatchRef ));
-#if 0
- if ( pMenu->GetItemText( nItemId ).Len() == 0 )
- aQueryLabelItemIdVector.push_back( nItemId );
-#endif
+
}
}
}
// retrieve label information for all menu items without item text
-#if 0
- if ( aQueryLabelItemIdVector.size() > 0 )
- {
- Sequence< ::rtl::OUString > aURLSequence( aQueryLabelItemIdVector.size() );
- Sequence< ::rtl::OUString > aLabelSequence( aQueryLabelItemIdVector.size() );
-
- sal_uInt32 nPos = 0;
- ::std::vector< USHORT >::iterator p;
- for ( p = aQueryLabelItemIdVector.begin(); p != aQueryLabelItemIdVector.end(); p++ )
- aURLSequence[nPos++] = pMenu->GetItemCommand( *p );
- Reference< XDispatchInformationProvider > xDIP( xFrame, UNO_QUERY );
- if ( xDIP.is() )
- {
- nPos = 0;
- xDIP->queryDispatchInformations( aURLSequence, aLabelSequence );
- for ( p = aQueryLabelItemIdVector.begin(); p != aQueryLabelItemIdVector.end(); p++ )
- pMenu->SetItemText( *p, aLabelSequence( nPos++ ));
- }
- }
-#endif
SetHdl();
}
-#if 0
-// #110897#
-MenuManager::MenuManager(
- const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
- REFERENCE< XFRAME >& rFrame, AddonMenu* pAddonMenu, sal_Bool bDelete, sal_Bool bDeleteChildren )
-: // #110897#
- ThreadHelpBase( &Application::GetSolarMutex() ),
- mxServiceFactory(xServiceFactory)
-{
- m_bActive = sal_False;
- m_bDeleteMenu = bDelete;
- m_bDeleteChildren = bDeleteChildren;
- m_pVCLMenu = pAddonMenu;
- m_xFrame = rFrame;
- m_bInitialized = sal_False;
- m_bIsBookmarkMenu = sal_True;
-
- const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
- m_bWasHiContrast = rSettings.GetHighContrastMode();
-
- SAL_STATIC_CAST( ::com::sun::star::uno::XInterface*, (OWeakObject*)this )->acquire();
-
- USHORT nItemCount = pAddonMenu->GetItemCount();
- m_aMenuItemHandlerVector.reserve(nItemCount);
- ::rtl::OUString aItemCommand;
- for ( USHORT i = 0; i < nItemCount; i++ )
- {
- USHORT nItemId = FillItemCommand(aItemCommand,pAddonMenu, i );
-
- PopupMenu* pPopupMenu = pAddonMenu->GetPopupMenu( nItemId );
- if ( pPopupMenu )
- {
- // #110897#
- // MenuManager* pSubMenuManager = new MenuManager( rFrame, pPopupMenu, bDeleteChildren, bDeleteChildren );
- AddMenu(pPopupMenu,aItemCommand,nItemId,bDeleteChildren,bDeleteChildren);
- }
- else
- {
- if ( pAddonMenu->GetItemType( i ) != MENUITEM_SEPARATOR )
- {
- MenuConfiguration::Attributes* pAddonAttributes = (MenuConfiguration::Attributes *)(pAddonMenu->GetUserValue( nItemId ));
- REFERENCE< XDISPATCH > aXDispatchRef;
- MenuItemHandler* pMenuItemHandler = new MenuItemHandler( nItemId, NULL, aXDispatchRef );
-
- if ( pAddonAttributes )
- {
- // read additional attributes from attributes struct and AddonMenu implementation will delete all attributes itself!!
- pMenuItemHandler->aTargetFrame = pAddonAttributes->aTargetFrame;
- }
-
- m_aMenuItemHandlerVector.push_back( pMenuItemHandler );
- }
- }
- }
-
- SetHdl();
-}
-#endif
void MenuManager::SetHdl()
{
diff --git a/framework/source/services/license.cxx b/framework/source/services/license.cxx
index a7a8d55..61754bd 100644
--- a/framework/source/services/license.cxx
+++ b/framework/source/services/license.cxx
@@ -165,22 +165,6 @@ DEFINE_INIT_SERVICE ( License,
)
-#if 0
-IMPL_STATIC_LINK_NOINSTANCE( License, Terminate, void*, EMPTYARG )
-{
- /*
- Reference< XMultiServiceFactory > xFactory = comphelper::getProcessServiceFactory();
- Reference< XDesktop > xDesktop(xFactory->createInstance(
- ::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop")), UNO_QUERY);
- if (xDesktop.is())
- xDesktop->terminate();
- */
- /*
- _exit(0);
- */
- return 0;
-}
-#endif
static DateTime _oslDateTimeToDateTime(const oslDateTime& aDateTime)
{
diff --git a/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx
index 80c6edd..ef86782 100644
--- a/scripting/source/vbaevents/eventhelper.cxx
+++ b/scripting/source/vbaevents/eventhelper.cxx
@@ -119,78 +119,6 @@ using namespace ::ooo::vba;
const static rtl::OUString DELIM = rtl::OUString::createFromAscii( "::" );
const static sal_Int32 DELIMLEN = DELIM.getLength();
-#if 0
-void dumpListeners( const Reference< beans::XIntrospection >& xIntrospection, const Reference<XInterface>& xIfc)
-{
- Reference< beans::XIntrospectionAccess > xIntrospectionAccess;
- if ( xIntrospection.is() )
- {
- xIntrospectionAccess = xIntrospection->inspect(
- makeAny( xIfc ) );
- Sequence< Type > aControlListeners =
- xIntrospectionAccess->getSupportedListeners();
- sal_Int32 nLength = aControlListeners.getLength();
-
- for ( sal_Int32 i = 0; i< nLength; ++i )
- {
- Type& listType = aControlListeners[ i ];
- rtl::OUString sFullTypeName = listType.getTypeName();
- rtl::OUString sTypeName = listType.getTypeName();
- sal_Int32 lastDotIndex = -1;
- if ( ( lastDotIndex = sFullTypeName.lastIndexOf( '.' ) ) > -1 )
- {
- sTypeName = sFullTypeName.copy( lastDotIndex + 1 );
- }
- Sequence< ::rtl::OUString > sMeths = comphelper::getEventMethodsForType( listType );
- sal_Int32 sMethLen = sMeths.getLength();
- for ( sal_Int32 j=0 ; j < sMethLen; ++j )
- {
- OSL_TRACE("**Listener [%d] Type[%s] Method[%s]",j,
- rtl::OUStringToOString( sTypeName,
- RTL_TEXTENCODING_UTF8 ).getStr(),
- rtl::OUStringToOString( sMeths[ j ],
- RTL_TEXTENCODING_UTF8 ).getStr() );
- }
- }
-
- }
-}
-
-void dumpEvent( const ScriptEvent& evt )
-{
- OSL_TRACE("dumpEvent: Source %s",
- rtl::OUStringToOString( comphelper::anyToString( makeAny(evt.Source)),
- RTL_TEXTENCODING_UTF8 ).getStr() );
-
- OSL_TRACE("dumpEvent: ScriptType %s",
- rtl::OUStringToOString( evt.ScriptType,
- RTL_TEXTENCODING_UTF8 ).getStr() );
-
- OSL_TRACE("dumpEvent: ScriptCode %s",
- rtl::OUStringToOString( evt.ScriptCode,
- RTL_TEXTENCODING_UTF8 ).getStr() );
-
- OSL_TRACE("dumpEvent: ListenerType %s",
- rtl::OUStringToOString( evt.ListenerType.getTypeName(),
- RTL_TEXTENCODING_UTF8 ).getStr() );
-
- OSL_TRACE("dumpEvent: Listener methodname %s",
- rtl::OUStringToOString( evt.MethodName,
- RTL_TEXTENCODING_UTF8 ).getStr() );
-
- OSL_TRACE("dumpEvent: arguments;");
- sal_Int32 nLen = evt.Arguments.getLength();
- for ( sal_Int32 index=0; index < nLen; ++index )
- {
- OSL_TRACE("\t [%d] %s", index,
- rtl::OUStringToOString( comphelper::anyToString( evt.Arguments[ index ] ),
- RTL_TEXTENCODING_UTF8 ).getStr() );
-
- }
-}
-
-#endif
-
bool isKeyEventOk( awt::KeyEvent& evt, const Sequence< Any >& params )
{
if ( !( params.getLength() > 0 ) ||
@@ -514,10 +442,7 @@ ScriptEventHelper::getEventListeners()
Reference< beans::XIntrospection > xIntrospection(
xMFac->createInstanceWithContext( rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.beans.Introspection" ) ), m_xCtx ), UNO_QUERY );
-#if 0
- dumpListeners( xIntrospection, m_xControl );
- dumpListeners( xIntrospection, m_xControl->getModel() );
-#endif
+
Reference< beans::XIntrospectionAccess > xIntrospectionAccess;
if ( xIntrospection.is() )
{
diff --git a/sfx2/inc/sfx2/app.hxx b/sfx2/inc/sfx2/app.hxx
index 3a8f005..150070b 100644
--- a/sfx2/inc/sfx2/app.hxx
+++ b/sfx2/inc/sfx2/app.hxx
@@ -159,12 +159,10 @@ class SFX2_DLLPUBLIC SfxApplication: public SfxShell
SfxAppData_Impl* pAppData_Impl;
-//#if 0 // _SOLAR__PRIVATE
DECL_DLLPRIVATE_LINK( GlobalBasicErrorHdl_Impl, StarBASIC* );
SAL_DLLPRIVATE BOOL SaveAll_Impl(BOOL bPrompt = FALSE, BOOL bAutoSave = FALSE);
SAL_DLLPRIVATE short QuerySave_Impl(SfxObjectShell &, BOOL bAutoSave = FALSE);
SAL_DLLPRIVATE void InitializeDisplayName_Impl();
-//#endif
static SfxApplication* Create();
void Init();
@@ -258,7 +256,6 @@ public:
const String* pPostStr = 0);
void ResetLastDir();
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE static SfxApplication* Get() { return pApp;}
SAL_DLLPRIVATE SfxDispatcher* GetAppDispatcher_Impl();
SAL_DLLPRIVATE SfxDispatcher* GetDispatcher_Impl();
@@ -316,7 +313,6 @@ public:
SAL_DLLPRIVATE SfxSlotPool& GetAppSlotPool_Impl() const;
SAL_DLLPRIVATE SfxModule* GetModule_Impl();
SAL_DLLPRIVATE ResMgr* GetOffResManager_Impl();
-//#endif
/* loads a branded bitmap - that can be overridden per locale */
static bool LoadBrandBitmap (const char* pName, BitmapEx &rBitmap);
diff --git a/sfx2/inc/sfx2/bindings.hxx b/sfx2/inc/sfx2/bindings.hxx
index d7fc939..93619c1 100644
--- a/sfx2/inc/sfx2/bindings.hxx
+++ b/sfx2/inc/sfx2/bindings.hxx
@@ -117,7 +117,6 @@ friend class SfxBindings_Impl;
SfxDispatcher* pDispatcher; // zu verwendender Dispatcher
sal_uInt16 nRegLevel; // Lock-Level waehrend Reconfig
-//#if 0 // _SOLAR__PRIVATE
private:
SAL_DLLPRIVATE const SfxPoolItem* Execute_Impl( sal_uInt16 nSlot, const SfxPoolItem **pArgs, sal_uInt16 nModi,
SfxCallMode nCall, const SfxPoolItem **pInternalArgs, BOOL bGlobalOnly=FALSE);
@@ -135,7 +134,6 @@ private:
const SfxPoolItem *pItem,
SfxItemState eItemState );
DECL_DLLPRIVATE_LINK( NextJob_Impl, Timer * );
-//#endif
public:
SfxBindings();
@@ -193,7 +191,6 @@ public:
com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > GetRecorder() const;
com::sun::star::uno::Reference < com::sun::star::frame::XDispatch >
GetDispatch( const SfxSlot*, const com::sun::star::util::URL& aURL, sal_Bool bMasterCommand );
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE void ContextChanged_Impl();
SAL_DLLPRIVATE void Execute_Impl( SfxRequest& rReq, const SfxSlot* pSlot, SfxShell* pShell );
SAL_DLLPRIVATE void DeleteControllers_Impl();
@@ -214,7 +211,6 @@ public:
SAL_DLLPRIVATE void ExecuteGlobal_Impl( USHORT nId );
SAL_DLLPRIVATE void InvalidateSlotsInMap_Impl();
SAL_DLLPRIVATE void AddSlotToInvalidateSlotsMap_Impl( USHORT nId );
-//#endif
};
#ifdef DBG_UTIL
diff --git a/sfx2/inc/sfx2/childwin.hxx b/sfx2/inc/sfx2/childwin.hxx
index a832499..0071d7f 100644
--- a/sfx2/inc/sfx2/childwin.hxx
+++ b/sfx2/inc/sfx2/childwin.hxx
@@ -77,13 +77,11 @@ struct SfxChildWinInfo
bVisible = sal_False;
nFlags = 0;
}
-//#if 0 // _SOLAR__PRIVATE
sal_Bool GetExtraData_Impl( SfxChildAlignment *pAlign,
SfxChildAlignment *pLastAlign = 0,
Size *pSize = 0,
sal_uInt16 *pLine = 0,
sal_uInt16 *pPos = 0 ) const;
-//#endif
};
// Factory-Methode eines ChildWindows
@@ -126,16 +124,11 @@ struct SfxChildWinFactory
, pArr( NULL )
{}
-//#if 0 // _SOLAR__PRIVATE
~SfxChildWinFactory()
{
delete pArr;
}
-//#else
- // Der WIN16-Compiler versucht dort zu "ubersetzen, wo dieser Header
- // included wird, und kann dann nat"urlich nicht linken, wenn inline ...
-// ~SfxChildWinFactory();
-//#endif
+
};
class FloatingWindow;
@@ -240,7 +233,6 @@ public:
virtual com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > GetFrame();
void SetFrame( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > & );
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE static void InitializeChildWinFactory_Impl(sal_uInt16, SfxChildWinInfo&);
SAL_DLLPRIVATE void SetVisible_Impl( sal_Bool bVis );
SAL_DLLPRIVATE void SetWorkWindow_Impl( SfxWorkWindow* );
@@ -252,7 +244,6 @@ public:
GetContext_Impl() const
{ return pContext; }
SAL_DLLPRIVATE void SetFactory_Impl( SfxChildWinFactory* );
-//#endif
};
//------------------------------------------------------------------
diff --git a/sfx2/inc/sfx2/ctrlitem.hxx b/sfx2/inc/sfx2/ctrlitem.hxx
index a939dc3..c1711b7 100644
--- a/sfx2/inc/sfx2/ctrlitem.hxx
+++ b/sfx2/inc/sfx2/ctrlitem.hxx
@@ -85,11 +85,9 @@ public:
static SfxItemState GetItemState( const SfxPoolItem* pState );
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE BOOL IsBindable_Impl() const
{ return pBindings != NULL; }
SAL_DLLPRIVATE void BindInternal_Impl( USHORT nNewId, SfxBindings* );
-//#endif
};
//====================================================================
diff --git a/sfx2/inc/sfx2/dispatch.hxx b/sfx2/inc/sfx2/dispatch.hxx
index 97027bf..ae92da5 100644
--- a/sfx2/inc/sfx2/dispatch.hxx
+++ b/sfx2/inc/sfx2/dispatch.hxx
@@ -234,7 +234,6 @@ public:
void SetDisableFlags( sal_uInt32 nFlags );
sal_uInt32 GetDisableFlags() const;
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE BOOL HasSlot_Impl( USHORT );
SAL_DLLPRIVATE void SetMenu_Impl();
SAL_DLLPRIVATE long Update_Impl( BOOL bForce = FALSE ); // ObjectBars etc.
@@ -258,7 +257,6 @@ public:
SAL_DLLPRIVATE void DoDeactivate_Impl( BOOL bMDI, SfxViewFrame* pNew );
SAL_DLLPRIVATE void InvalidateBindings_Impl(BOOL);
SAL_DLLPRIVATE USHORT GetNextToolBox_Impl( USHORT nPos, USHORT nType, String *pStr );
-//#endif
};
//--------------------------------------------------------------------
diff --git a/sfx2/inc/sfx2/docfac.hxx b/sfx2/inc/sfx2/docfac.hxx
index 3054278..9180c52 100644
--- a/sfx2/inc/sfx2/docfac.hxx
+++ b/sfx2/inc/sfx2/docfac.hxx
@@ -108,11 +108,9 @@ public:
SfxModule* GetModule() const;
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE void SetModule_Impl( SfxModule* );
SAL_DLLPRIVATE static void UpdateFilterContainers_Impl();
SAL_DLLPRIVATE sal_uInt16 GetViewNo_Impl( const sal_uInt16 i_nViewId, const sal_uInt16 i_nFallback ) const;
-//#endif
private:
// Kopieren verboten
diff --git a/sfx2/inc/sfx2/dockwin.hxx b/sfx2/inc/sfx2/dockwin.hxx
index 1ba7dcd..1c318da 100644
--- a/sfx2/inc/sfx2/dockwin.hxx
+++ b/sfx2/inc/sfx2/dockwin.hxx
@@ -76,9 +76,7 @@ protected:
virtual BOOL Close();
virtual void Move();
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE SfxChildWindow* GetChildWindow_Impl() { return pMgr; }
-//#endif
public:
SfxDockingWindow( SfxBindings *pBindings,
@@ -113,7 +111,6 @@ public:
void AutoShow( BOOL bShow = TRUE );
DECL_LINK( TimerHdl, Timer* );
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE void Initialize_Impl();
SAL_DLLPRIVATE USHORT GetWinBits_Impl() const;
SAL_DLLPRIVATE void SetItemSize_Impl( const Size& rSize );
@@ -125,7 +122,6 @@ public:
SAL_DLLPRIVATE void Pin_Impl( BOOL bPinned );
SAL_DLLPRIVATE SfxSplitWindow* GetSplitWindow_Impl() const;
SAL_DLLPRIVATE void ReleaseChildWindow_Impl();
-//#endif
};
class SfxDockingWrapper : public SfxChildWindow
diff --git a/sfx2/inc/sfx2/fcontnr.hxx b/sfx2/inc/sfx2/fcontnr.hxx
index 16f23d9..0f85b7f 100644
--- a/sfx2/inc/sfx2/fcontnr.hxx
+++ b/sfx2/inc/sfx2/fcontnr.hxx
@@ -115,14 +115,12 @@ public:
const SfxFilter* GetFilter4FilterName( const String& rName, SfxFilterFlags nMust = 0, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const;
const SfxFilter* GetFilter4UIName( const String& rName, SfxFilterFlags nMust = 0, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const;
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE static void ReadFilters_Impl( BOOL bUpdate=FALSE );
SAL_DLLPRIVATE static void ReadSingleFilter_Impl( const ::rtl::OUString& rName,
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& xTypeCFG,
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& xFilterCFG,
BOOL bUpdate );
SAL_DLLPRIVATE static const SfxFilter* GetDefaultFilter_Impl( const String& );
-//#endif
};
class SfxFilterMatcher_Impl;
@@ -136,10 +134,8 @@ public:
SfxFilterMatcher();
~SfxFilterMatcher();
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE static BOOL IsFilterInstalled_Impl( const SfxFilter* pFilter );
DECL_DLLPRIVATE_STATIC_LINK( SfxFilterMatcher, MaybeFileHdl_Impl, String* );
-//#endif
sal_uInt32 GuessFilterIgnoringContent( SfxMedium& rMedium, const SfxFilter **, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const;
sal_uInt32 GuessFilter( SfxMedium& rMedium, const SfxFilter **, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const;
@@ -164,9 +160,7 @@ class SFX2_DLLPUBLIC SfxFilterMatcherIter
USHORT nCurrent;
const SfxFilterMatcher_Impl *pMatch;
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE const SfxFilter* Find_Impl();
-//#endif
public:
SfxFilterMatcherIter( const SfxFilterMatcher* pMatchP, SfxFilterFlags nMask = 0, SfxFilterFlags nNotMask = SFX_FILTER_NOTINSTALLED );
diff --git a/sfx2/inc/sfx2/filedlghelper.hxx b/sfx2/inc/sfx2/filedlghelper.hxx
index 3be1314..80e006b 100644
--- a/sfx2/inc/sfx2/filedlghelper.hxx
+++ b/sfx2/inc/sfx2/filedlghelper.hxx
@@ -133,12 +133,9 @@ private:
::com::sun::star::uno::Reference < ::com::sun::star::ui::dialogs::XFilePickerListener > mxImp;
FileDialogHelper_Impl *mpImp;
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE sal_Int16 getDialogType( sal_Int64 nFlags ) const;
-//#endif
-
public:
FileDialogHelper( sal_Int64 nFlags,
const String& rFactory,
@@ -291,21 +288,18 @@ public:
DECL_LINK( ExecuteSystemFilePicker, void* );
-//#if 0 // _SOLAR__PRIVATE
ErrCode Execute( SvStringsDtor*& rpURLList,
SfxItemSet *& rpSet,
String& rFilter,
const String& rDirPath );
ErrCode Execute( SfxItemSet *& rpSet,
String& rFilter );
-//#endif
};
#define SFX2_IMPL_DIALOG_CONFIG 0
#define SFX2_IMPL_DIALOG_SYSTEM 1
#define SFX2_IMPL_DIALOG_OOO 2
-//#if 0 // _SOLAR__PRIVATE
ErrCode FileOpenDialog_Impl( sal_Int64 nFlags,
const String& rFact,
SvStringsDtor *& rpURLList,
@@ -315,7 +309,6 @@ ErrCode FileOpenDialog_Impl( sal_Int64 nFlags,
sal_Int16 nDialog = SFX2_IMPL_DIALOG_CONFIG,
const String& rStandardDir = String::CreateFromAscii( "" ),
const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList = ::com::sun::star::uno::Sequence< ::rtl::OUString >());
-//#endif
}
//-----------------------------------------------------------------------------
diff --git a/sfx2/inc/sfx2/frame.hxx b/sfx2/inc/sfx2/frame.hxx
index ecc16b4..7505ac2 100644
--- a/sfx2/inc/sfx2/frame.hxx
+++ b/sfx2/inc/sfx2/frame.hxx
@@ -183,7 +183,6 @@ public:
sal_Bool IsInPlace() const;
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE sal_Bool DoClose_Impl();
SAL_DLLPRIVATE void SetFrameInterface_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
SAL_DLLPRIVATE void ReleasingComponent_Impl( sal_Bool bSet );
@@ -225,7 +224,6 @@ public:
SAL_DLLPRIVATE SystemWindow* GetTopWindow_Impl() const;
SAL_DLLPRIVATE void PositionWindow_Impl( const Rectangle& rWinArea ) const;
SAL_DLLPRIVATE bool IsMarkedHidden_Impl() const;
-//#endif
private:
SAL_DLLPRIVATE void Construct_Impl();
};
@@ -237,9 +235,7 @@ class SfxFrameIterator
const SfxFrame* pFrame;
sal_Bool bRecursive;
-//#if 0 // _SOLAR__PRIVATE
SfxFrame* NextSibling_Impl( SfxFrame& rPrev );
-//#endif
public:
SfxFrameIterator( const SfxFrame& rFrame, sal_Bool bRecursive=sal_True );
diff --git a/sfx2/inc/sfx2/hintpost.hxx b/sfx2/inc/sfx2/hintpost.hxx
index a908bb7..0cbcdd3 100644
--- a/sfx2/inc/sfx2/hintpost.hxx
+++ b/sfx2/inc/sfx2/hintpost.hxx
@@ -57,9 +57,7 @@ class SfxHintPoster: public SvRefBase
private:
void RegisterEvent();
-//#if 0 // _SOLAR__PRIVATE
DECL_LINK( DoEvent_Impl, SfxHint * );
-//#endif
protected:
virtual ~SfxHintPoster();
diff --git a/sfx2/inc/sfx2/layout.hxx b/sfx2/inc/sfx2/layout.hxx
index 836a762..c4d2858 100644
--- a/sfx2/inc/sfx2/layout.hxx
+++ b/sfx2/inc/sfx2/layout.hxx
@@ -49,18 +49,6 @@ public:
SfxDialog (::Window* parent, char const* xml_file, char const* id, SfxBindings* bindings=0, SfxChildWindow* child=0);
};
-#if 0
-class SFX2_DLLPUBLIC SfxTabDialog
- : public ::SfxTabDialog
- , public InPlug
-{
-public:
- SfxTabDialog (::Window *parent, char const* xml_file, char const* id, ResId const& res_id, SfxItemSet const* set=0);
- ::Window* GetParent () const;
- void FreeResource ();
-};
-#endif
-
class SFX2_DLLPUBLIC SfxTabPage
: public ::SfxTabPage
, public InPlug
diff --git a/sfx2/inc/sfx2/macrconf.hxx b/sfx2/inc/sfx2/macrconf.hxx
index e0e1ddd..a70d3e5 100644
--- a/sfx2/inc/sfx2/macrconf.hxx
+++ b/sfx2/inc/sfx2/macrconf.hxx
@@ -49,11 +49,7 @@ class SvStream;
class SvxMacro;
typedef SfxMacroInfo* SfxMacroInfoPtr;
-//#if 0 // _SOLAR__PRIVATE
SV_DECL_PTRARR(SfxMacroInfoArr_Impl, SfxMacroInfoPtr, 5, 5)
-//#else
-//class SfxMacroInfoArr_Impl;
-//#endif
class SFX2_DLLPUBLIC SfxMacroInfo
{
@@ -144,12 +140,10 @@ public:
sal_Bool CheckMacro(sal_uInt16 nId) const;
sal_Bool CheckMacro( SfxObjectShell*, const SvxMacro* ) const;
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE static void Release_Impl();
SAL_DLLPRIVATE const SfxMacroInfo* GetMacroInfo_Impl( const SvxMacro *pMacro ) const;
DECL_DLLPRIVATE_LINK( CallbackHdl_Impl, SfxMacroConfig*);
DECL_DLLPRIVATE_LINK( EventHdl_Impl, SfxMacroInfo*);
-//#endif
};
#endif
diff --git a/sfx2/inc/sfx2/macropg.hxx b/sfx2/inc/sfx2/macropg.hxx
index 03695d2..8e003a4 100644
--- a/sfx2/inc/sfx2/macropg.hxx
+++ b/sfx2/inc/sfx2/macropg.hxx
@@ -55,7 +55,6 @@ class _SfxMacroTabPage_Impl;
class SFX2_DLLPUBLIC _SfxMacroTabPage : public SfxTabPage
{
SvxMacroTableDtor aTbl;
-//#if 0 // _SOLAR__PRIVATE
DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, SelectEvent_Impl, SvTabListBox * );
DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, SelectGroup_Impl, ListBox * );
DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, SelectMacro_Impl, ListBox * );
@@ -66,7 +65,6 @@ class SFX2_DLLPUBLIC _SfxMacroTabPage : public SfxTabPage
DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, ChangeScriptHdl_Impl, RadioButton * );
DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, GetFocus_Impl, Edit* );
DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, TimeOut_Impl, Timer* );
-//#endif
protected:
_SfxMacroTabPage_Impl* mpImpl;
diff --git a/sfx2/inc/sfx2/mgetempl.hxx b/sfx2/inc/sfx2/mgetempl.hxx
index 333640a..5029166 100644
--- a/sfx2/inc/sfx2/mgetempl.hxx
+++ b/sfx2/inc/sfx2/mgetempl.hxx
@@ -82,13 +82,11 @@ class SfxManageStyleSheetPage : public SfxTabPage
private:
friend class SfxStyleDialog;
-//#if 0 // _SOLAR__PRIVATE
DECL_LINK( GetFocusHdl, Edit * );
DECL_LINK( LoseFocusHdl, Edit * );
void UpdateName_Impl(ListBox *, const String &rNew);
void SetDescriptionText_Impl();
-//#endif
SfxManageStyleSheetPage(Window *pParent, const SfxItemSet &rAttrSet );
~SfxManageStyleSheetPage();
diff --git a/sfx2/inc/sfx2/mnuitem.hxx b/sfx2/inc/sfx2/mnuitem.hxx
index 5da7221..be7ac34 100644
--- a/sfx2/inc/sfx2/mnuitem.hxx
+++ b/sfx2/inc/sfx2/mnuitem.hxx
@@ -153,7 +153,6 @@ inline SfxVirtualMenu* SfxMenuControl::GetPopupMenu() const
{ SfxMenuControl::RegisterMenuControl( pMod, new SfxMenuCtrlFactory( \
Class::CreateImpl, TYPE(nItemClass), nSlotId ) ); }
-//#if 0 // _SOLAR__PRIVATE
class SfxAppMenuControl_Impl : public SfxMenuControl
{
@@ -171,6 +170,4 @@ public:
~SfxAppMenuControl_Impl();
};
-//#endif
-
#endif
diff --git a/sfx2/inc/sfx2/mnumgr.hxx b/sfx2/inc/sfx2/mnumgr.hxx
index 6248001..ebc1537 100644
--- a/sfx2/inc/sfx2/mnumgr.hxx
+++ b/sfx2/inc/sfx2/mnumgr.hxx
@@ -87,9 +87,7 @@ public:
ResMgr* GetResMgr() const { return pResMgr; }
void SetPopupMenu( USHORT nId, PopupMenu *pMenu );
-//#if 0 // _SOLAR__PRIVATE
void Construct_Impl( Menu* pMenu, BOOL bWithHelp );
-//#endif
};
//--------------------------------------------------------------------
diff --git a/sfx2/inc/sfx2/module.hxx b/sfx2/inc/sfx2/module.hxx
index 2cb48c6..f9d1642 100644
--- a/sfx2/inc/sfx2/module.hxx
+++ b/sfx2/inc/sfx2/module.hxx
@@ -65,9 +65,7 @@ private:
sal_Bool bDummy : 1;
SfxModule_Impl* pImpl;
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE void Construct_Impl();
-//#endif
public:
TYPEINFO();
@@ -99,7 +97,6 @@ public:
static FieldUnit GetCurrentFieldUnit();
FieldUnit GetFieldUnit() const;
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE static SfxModuleArr_Impl& GetModules_Impl();
SAL_DLLPRIVATE static void DestroyModules_Impl();
SAL_DLLPRIVATE SfxTbxCtrlFactArr_Impl* GetTbxCtrlFactories_Impl() const;
@@ -108,7 +105,6 @@ public:
SAL_DLLPRIVATE SfxChildWinFactArr_Impl* GetChildWinFactories_Impl() const;
SAL_DLLPRIVATE ImageList* GetImageList_Impl( BOOL bBig );
SAL_DLLPRIVATE ImageList* GetImageList_Impl( BOOL bBig, BOOL bHiContrast );
-//#endif
};
#endif
diff --git a/sfx2/inc/sfx2/newstyle.hxx b/sfx2/inc/sfx2/newstyle.hxx
index 108b972..f10feb2 100644
--- a/sfx2/inc/sfx2/newstyle.hxx
+++ b/sfx2/inc/sfx2/newstyle.hxx
@@ -49,10 +49,8 @@ private:
QueryBox aQueryOverwriteBox;
SfxStyleSheetBasePool& rPool;
-//#if 0 // _SOLAR__PRIVATE
DECL_DLLPRIVATE_LINK( OKHdl, Control * );
DECL_DLLPRIVATE_LINK( ModifyHdl, ComboBox * );
-//#endif
public:
SfxNewStyleDlg( Window* pParent, SfxStyleSheetBasePool& );
diff --git a/sfx2/inc/sfx2/objface.hxx b/sfx2/inc/sfx2/objface.hxx
index 986c3f9..4e74825 100644
--- a/sfx2/inc/sfx2/objface.hxx
+++ b/sfx2/inc/sfx2/objface.hxx
@@ -107,12 +107,10 @@ public:
void Register( SfxModule* );
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE int ContainsSlot_Impl( const SfxSlot *pSlot ) const
{ return pSlot >= pSlots && pSlot < pSlots + Count(); }
SAL_DLLPRIVATE ResMgr* GetResManager_Impl() const
{ return aNameResId.GetResMgr(); }
-//#endif
};
//--------------------------------------------------------------------
@@ -133,7 +131,6 @@ inline SfxSlot* SfxInterface::operator[]( USHORT nPos ) const
return nPos < nCount? pSlots+nPos: 0;
}
-//#if 0 // _SOLAR__PRIVATE
class SfxIFConfig_Impl
{
friend class SfxInterface;
@@ -147,6 +144,5 @@ public:
void RegisterObjectBar( USHORT, const ResId&, sal_uInt32 nFeature, const String* pST=0 );
USHORT GetType();
};
-//#endif
#endif
diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx
index 6070bd1..520944a 100644
--- a/sfx2/inc/sfx2/objsh.hxx
+++ b/sfx2/inc/sfx2/objsh.hxx
@@ -52,9 +52,7 @@
// include something else
//________________________________________________________________________________________________________________
-//#if 0 // _SOLAR__PRIVATE
#include <vcl/timer.hxx>
-//#endif
#include <svl/poolitem.hxx>
#include <vcl/timer.hxx>
#include <vcl/bitmap.hxx>
@@ -223,16 +221,11 @@ private:
bIsTmp :1; // temp. Storage
private:
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE void UpdateTime_Impl(const ::com::sun::star::uno::Reference<
::com::sun::star::document::XDocumentProperties> & i_xDocProps);
SAL_DLLPRIVATE sal_Bool SaveTo_Impl(SfxMedium &rMedium, const SfxItemSet* pSet );
-//REMOVE sal_Bool SaveInfoAndConfig_Impl( SvStorageRef pNewStg );
-
-//#endif
-
protected:
SfxObjectShell(SfxObjectCreateMode);
SfxObjectShell( const sal_uInt64 i_nCreationFlags ); // see sfxmodelfactory.hxx
@@ -314,10 +307,8 @@ public:
void SetSharedXMLFlag( sal_Bool bFlag ) const;
sal_Bool HasSharedXMLFlagSet() const;
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE void SetModalMode_Impl(sal_Bool bModal=sal_True);
SAL_DLLPRIVATE void SetMacroMode_Impl(sal_Bool bModal=sal_True);
-//#endif
void ResetError();
sal_uInt32 GetError() const;
@@ -725,8 +716,6 @@ public:
// =================================
-//#if 0 // _SOLAR__PRIVATE
-
SAL_DLLPRIVATE ::boost::shared_ptr<GDIMetaFile> CreatePreviewMetaFile_Impl( sal_Bool bFullContent, sal_Bool bHighContrast ) const;
SAL_DLLPRIVATE sal_Bool IsOwnStorageFormat_Impl(const SfxMedium &) const;
@@ -827,8 +816,6 @@ public:
0x9eaba5c3, 0xb232, 0x4309, \
0x84, 0x5f, 0x5f, 0x15, 0xea, 0x50, 0xd0, 0x74
-//#if 0 // _SOLAR__PRIVATE
-
struct ModifyBlocker_Impl
{
SfxObjectShell* pPersist;
@@ -845,7 +832,7 @@ public:
pPersist->EnableSetModified( bWasEnabled );
}
};
-//#endif
+
//--------------------------------------------------------------------
@@ -858,8 +845,6 @@ SV_IMPL_LOCK(SfxObjectShell)
SV_IMPL_REF(SfxObjectShell)
SfxObjectShellRef MakeObjectShellForOrganizer_Impl( const String& rName, BOOL bWriting );
-
-//#if 0 // _SOLAR__PRIVATE
//--------------------------------------------------------------------
class AutoReloadTimer_Impl : public Timer
{
@@ -872,7 +857,6 @@ public:
SfxObjectShell* pSh );
virtual void Timeout();
};
-//#endif
//-------------------------------------------------------------------------
diff --git a/sfx2/inc/sfx2/prnmon.hxx b/sfx2/inc/sfx2/prnmon.hxx
index 3d7553a..3a778bf 100644
--- a/sfx2/inc/sfx2/prnmon.hxx
+++ b/sfx2/inc/sfx2/prnmon.hxx
@@ -43,35 +43,6 @@ struct SfxPrintProgress_Impl;
#define PAGE_MAX 9999 //max. Anzahl der Seiten die gedruckt werden
-//--------------------------------------------------------------------
-/*
-class SFX2_DLLPUBLIC SfxPrintProgress: public SfxProgress
-{
- SfxPrintProgress_Impl* pImp;
-
-private:
-//#if 0 // _SOLAR__PRIVATE
- DECL_DLLPRIVATE_LINK( PrintErrorNotify, void * );
- DECL_DLLPRIVATE_LINK( StartPrintNotify, void * );
- DECL_DLLPRIVATE_LINK( EndPrintNotify, void * );
-//#endif
-public:
- SfxPrintProgress( SfxViewShell* pViewSh,
- bool bShow = TRUE );
- virtual ~SfxPrintProgress();
-
- virtual void SetText( const String &rText );
- BOOL SetStateText( ULONG nVal, const String &rVal, ULONG nNewRange = 0 );
- virtual BOOL SetState( ULONG nVal, ULONG nNewRange = 0 );
-
- void RestoreOnEndPrint( SfxPrinter *pOldPrinter );
- void RestoreOnEndPrint( SfxPrinter *pOldPrinter,
- BOOL bOldEnablePrintFile );
- void DeleteOnEndPrint();
- void SetCancelHdl( const Link& aCancelHdl );
- BOOL IsAborted() const;
-};
-*/
// ------------------------------------------------------------------------
struct SfxPrintOptDlg_Impl;
diff --git a/sfx2/inc/sfx2/progress.hxx b/sfx2/inc/sfx2/progress.hxx
index 182996b..5ca3956 100644
--- a/sfx2/inc/sfx2/progress.hxx
+++ b/sfx2/inc/sfx2/progress.hxx
@@ -79,12 +79,10 @@ public:
static void EnterLock();
static void LeaveLock();
-//#if 0 // _SOLAR__PRIVATE
DECL_DLLPRIVATE_STATIC_LINK( SfxProgress, SetStateHdl, PlugInLoadStatus* );
DECL_DLLPRIVATE_STATIC_LINK( SfxProgress, DefaultBindingProgress, SvProgressArg* );
SAL_DLLPRIVATE bool StatusBarManagerGone_Impl(SfxStatusBarManager*pStb);
SAL_DLLPRIVATE const String& GetStateText_Impl() const;
-//#endif
};
#endif
diff --git a/sfx2/inc/sfx2/request.hxx b/sfx2/inc/sfx2/request.hxx
index 50104f8..480761e 100644
--- a/sfx2/inc/sfx2/request.hxx
+++ b/sfx2/inc/sfx2/request.hxx
@@ -61,7 +61,6 @@ friend struct SfxRequest_Impl;
SfxRequest_Impl* pImp;
//---------------------------------------------------------------------
-//#if 0 // _SOLAR__PRIVATE
public:
SAL_DLLPRIVATE void Record_Impl( SfxShell &rSh, const SfxSlot &rSlot,
com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > xRecorder,
@@ -69,7 +68,6 @@ public:
private:
SAL_DLLPRIVATE void Done_Impl( const SfxItemSet *pSet );
-//#endif
//---------------------------------------------------------------------
public:
diff --git a/sfx2/inc/sfx2/sfxbasecontroller.hxx b/sfx2/inc/sfx2/sfxbasecontroller.hxx
index 566e45a..a1d7a51 100644
--- a/sfx2/inc/sfx2/sfxbasecontroller.hxx
+++ b/sfx2/inc/sfx2/sfxbasecontroller.hxx
@@ -385,7 +385,6 @@ public:
virtual void SAL_CALL addTitleChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTitleChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL removeTitleChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTitleChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
-//#if 0 // _SOLAR__PRIVATE
// FIXME: TL needs this in sw/source/ui/uno/unotxdoc.cxx now;
// either the _Impl name should vanish or there should be an "official" API
SfxViewShell* GetViewShell_Impl() const;
@@ -394,7 +393,6 @@ public:
SAL_DLLPRIVATE BOOL HasMouseClickListeners_Impl();
SAL_DLLPRIVATE void SetCreationArguments_Impl( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& i_rCreationArgs );
SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTitle > impl_getTitleHelper ();
-//#endif
private:
enum ConnectSfxFrame
{
diff --git a/sfx2/inc/sfx2/styfitem.hxx b/sfx2/inc/sfx2/styfitem.hxx
index 7fb14e2..98aeee4 100644
--- a/sfx2/inc/sfx2/styfitem.hxx
+++ b/sfx2/inc/sfx2/styfitem.hxx
@@ -74,11 +74,7 @@ public:
void SetImage( const Image& _rImg ) { aImage = _rImg; }
};
-//#if 0 // _SOLAR__PRIVATE
DECLARE_LIST(SfxStyleFamilyList, SfxStyleFamilyItem*)
-//#else
-//typedef List SfxStyleFamilyList;
-//#endif
class SFX2_DLLPUBLIC SfxStyleFamilies: public Resource
{
diff --git a/sfx2/inc/sfx2/styledlg.hxx b/sfx2/inc/sfx2/styledlg.hxx
index d4f49c8..7e22587 100644
--- a/sfx2/inc/sfx2/styledlg.hxx
+++ b/sfx2/inc/sfx2/styledlg.hxx
@@ -38,9 +38,7 @@ class SFX2_DLLPUBLIC SfxStyleDialog: public SfxTabDialog
{
private:
SfxStyleSheetBase* pStyle;
-//#if 0 // _SOLAR__PRIVATE
DECL_DLLPRIVATE_LINK( CancelHdl, Button * );
-//#endif
protected:
virtual const SfxItemSet* GetRefreshedSet();
diff --git a/sfx2/inc/sfx2/tabdlg.hxx b/sfx2/inc/sfx2/tabdlg.hxx
index 6f84e0c..b67e3d5 100644
--- a/sfx2/inc/sfx2/tabdlg.hxx
+++ b/sfx2/inc/sfx2/tabdlg.hxx
@@ -110,7 +110,6 @@ friend class SfxTabDialogController;
BOOL bItemsReset;
BOOL bFmt;
-//#if 0 // _SOLAR__PRIVATE
DECL_DLLPRIVATE_LINK( ActivatePageHdl, TabControl * );
DECL_DLLPRIVATE_LINK( DeactivatePageHdl, TabControl * );
DECL_DLLPRIVATE_LINK( OkHdl, Button * );
@@ -119,7 +118,6 @@ friend class SfxTabDialogController;
DECL_DLLPRIVATE_LINK( UserHdl, Button * );
DECL_DLLPRIVATE_LINK( CancelHdl, Button * );
SAL_DLLPRIVATE void Init_Impl(BOOL, const String *);
-//#endif
protected:
virtual short Ok();
@@ -226,10 +224,8 @@ public:
void SetApplyHandler(const Link& _rHdl);
Link GetApplyHandler() const;
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE void Start_Impl();
SAL_DLLPRIVATE BOOL OK_Impl() { return PrepareLeaveCurrentPage(); }
-//#endif
};
END_NAMESPACE_LAYOUT_SFX_TABDIALOG
diff --git a/sfx2/inc/sfx2/tbxctrl.hxx b/sfx2/inc/sfx2/tbxctrl.hxx
index 7589d92..4713cad 100644
--- a/sfx2/inc/sfx2/tbxctrl.hxx
+++ b/sfx2/inc/sfx2/tbxctrl.hxx
@@ -127,10 +127,7 @@ private:
SAL_DLLPRIVATE SfxPopupWindow(SfxPopupWindow &); // not defined
SAL_DLLPRIVATE void operator =(SfxPopupWindow &); // not defined
-
-//#if 0 // _SOLAR__PRIVATE
DECL_DLLPRIVATE_LINK( Delete, void * );
-//#endif
protected:
virtual void PopupModeEnd();
@@ -316,7 +313,6 @@ public:
//=========================================================================
-//#if 0 // _SOLAR__PRIVATE
class SfxDragButton_Impl : public FixedImage
{
@@ -441,6 +437,4 @@ public:
void RefreshMenuImages( Menu* pMenu );
};
-//#endif
-
#endif
diff --git a/sfx2/inc/sfx2/unoctitm.hxx b/sfx2/inc/sfx2/unoctitm.hxx
index 52c24dd..233d423 100644
--- a/sfx2/inc/sfx2/unoctitm.hxx
+++ b/sfx2/inc/sfx2/unoctitm.hxx
@@ -164,7 +164,6 @@ public:
SfxDispatcher* GetDispatcher_Impl();
};
-//#if 0 // _SOLAR__PRIVATE
class SfxDispatchController_Impl : public SfxControllerItem
{
::com::sun::star::util::URL aDispatchURL;
@@ -205,7 +204,6 @@ public:
SfxDispatcher* GetDispatcher();
void SetFrame(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame);
};
-//#endif
#endif
diff --git a/sfx2/inc/sfx2/viewfrm.hxx b/sfx2/inc/sfx2/viewfrm.hxx
index 6782ee1..306e997 100644
--- a/sfx2/inc/sfx2/viewfrm.hxx
+++ b/sfx2/inc/sfx2/viewfrm.hxx
@@ -205,7 +205,6 @@ public:
void ChildWindowExecute(SfxRequest&);
void ChildWindowState(SfxItemSet&);
-//#if 0 // _SOLAR__PRIVATE
SAL_DLLPRIVATE void SetDowning_Impl();
SAL_DLLPRIVATE void GetDocNumber_Impl();
SAL_DLLPRIVATE BOOL IsDowning_Impl() const;
@@ -249,7 +248,6 @@ public:
SAL_DLLPRIVATE void SetCurViewId_Impl( const USHORT i_nID );
SAL_DLLPRIVATE void ActivateToolPanel_Impl( const ::rtl::OUString& i_rPanelURL );
-//#endif
private:
SAL_DLLPRIVATE BOOL SwitchToViewShell_Impl( USHORT nNo, BOOL bIsIndex = FALSE );
SAL_DLLPRIVATE void PopShellAndSubShells_Impl( SfxViewShell& i_rViewShell );
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index 73fb2dc..3d5962e 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -826,17 +826,6 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
// INet Session neu aufsetzen
if ( bResetSession )
{
- // no more sj2
- #if 0
- try
- {
- SjApplet2::settingsChanged();
- }
- catch ( ... )
- {
- DBG_ERRORFILE( "SjApplet2::settingsChanged() throws an exception" );
- }
- #endif
}
// geaenderte Daten speichern
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index d709832..9d66a85 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -2156,17 +2156,6 @@ SFX2_DLLPUBLIC sal_Bool SAL_CALL component_writeInfo(
aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
xNewKey = xKey->createKey( aTempStr );
xNewKey->createKey( ::rtl::OUString::createFromAscii("com.sun.star.frame.SpecialEmbeddedObject") );
-
- #if 0
- // AppletObject
- aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
- aImpl += ::sfx2::AppletObject::impl_getStaticImplementationName();
-
- aTempStr = aImpl;
- aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
- xNewKey = xKey->createKey( aTempStr );
- xNewKey->createKey( ::rtl::OUString::createFromAscii("com.sun.star.frame.SpecialEmbeddedObject") );
- #endif
// IFrameObject
aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
@@ -2343,13 +2332,6 @@ SFX2_DLLPUBLIC void* SAL_CALL component_getFactory(
IF_NAME_CREATECOMPONENTFACTORY( TestMouseClickHandler )
#endif
IF_NAME_CREATECOMPONENTFACTORY( OPackageStructureCreator )
- #if 0
- if ( ::sfx2::AppletObject::impl_getStaticImplementationName().equals(
- ::rtl::OUString::createFromAscii( pImplementationName ) ) )
- {
- xFactory = ::sfx2::AppletObject::impl_createFactory();
- }
- #endif
IF_NAME_CREATECOMPONENTFACTORY( ::sfx2::PluginObject )
IF_NAME_CREATECOMPONENTFACTORY( ::sfx2::IFrameObject )
IF_NAME_CREATECOMPONENTFACTORY( ::sfx2::OwnSubFilterService )
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx
index 986e0e3..c1a89ef 100644
--- a/sfx2/source/appl/childwin.cxx
+++ b/sfx2/source/appl/childwin.cxx
@@ -372,43 +372,6 @@ sal_uInt16 SfxChildWindow::GetPosition()
return pImp->pFact->nPos;
}
-#if 0
-static void ImplWindowStateFromStr( Point rPos, Size rSize, const ByteString& rStr )
-{
- ULONG nValidMask = 0;
- xub_StrLen nIndex = 0;
- ByteString aTokenStr;
-
- aTokenStr = rStr.GetToken( 0, ',', nIndex );
- if ( aTokenStr.Len() )
- {
- rPos.X() = aTokenStr.ToInt32();
- nValidMask |= WINDOWSTATE_MASK_X;
- }
-
- aTokenStr = rStr.GetToken( 0, ',', nIndex );
- if ( aTokenStr.Len() )
- {
- rPos.Y() = aTokenStr.ToInt32();
- nValidMask |= WINDOWSTATE_MASK_Y;
- }
-
- aTokenStr = rStr.GetToken( 0, ',', nIndex );
- if ( aTokenStr.Len() )
- {
- rSize.Width() = aTokenStr.ToInt32();
- nValidMask |= WINDOWSTATE_MASK_WIDTH;
- }
-
- aTokenStr = rStr.GetToken( 0, ';', nIndex );
- if ( aTokenStr.Len() )
- {
- rSize.Height() = aTokenStr.ToInt32();
- nValidMask |= WINDOWSTATE_MASK_HEIGHT;
- }
-}
-#endif
-
//-------------------------------------------------------------------------
void SfxChildWindow::InitializeChildWinFactory_Impl( sal_uInt16 nId, SfxChildWinInfo& rInfo )
{
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 6b294b8..d082864 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -1650,11 +1650,6 @@ void SfxWorkWindow::CreateChildWin_Impl( SfxChildWin_Impl *pCW, BOOL bSetFocus )
if ( bSetFocus )
bSetFocus = pChildWin->WantsFocus();
pChildWin->SetWorkWindow_Impl( this );
-#if 0
- // Enable-Status richtig setzen
- pChildWin->GetWindow()->EnableInput( pCW->bEnable &&
- ( pWorkWin->IsInputEnabled() /* || pChildWin->GetAlignment() == SFX_ALIGN_NOALIGNMENT */ ) );
-#endif
// Zumindest der ExtraString wird beim Auswerten ver"andert, also neu holen
SfxChildWinInfo aInfo = pChildWin->GetInfo();
pCW->aInfo.aExtraString = aInfo.aExtraString;
@@ -2216,11 +2211,6 @@ void SfxWorkWindow::SetChildWindowVisible_Impl( sal_uInt32 lId, BOOL bEnabled, U
pCW->nInterfaceId = nInter;
pCW->nVisibility = nMode;
pCW->bEnable = bEnabled;
-#if 0
- if ( pCW->pWin )
- pCW->pWin->GetWindow()->EnableInput( bEnabled &&
- ( pWorkWin->IsInputEnabled() /* || pCW->pWin->GetAlignment() == SFX_ALIGN_NOALIGNMENT */ ) );
-#endif
pCW->nVisibility = nMode;
}
diff --git a/sfx2/source/control/msgpool.cxx b/sfx2/source/control/msgpool.cxx
index aef0a92..fd55fe8 100644
--- a/sfx2/source/control/msgpool.cxx
+++ b/sfx2/source/control/msgpool.cxx
@@ -149,26 +149,6 @@ void SfxSlotPool::RegisterInterface( SfxInterface& rInterface )
else
_pGroups->Append(pDef->GetGroupId());
}
-#if 0
- const TypeId &rTypeId = pDef->GetType()->Type();
- if ( /*rTypeId != TYPE(SfxVoidItem) &&*/ rTypeId != 0 )
- {
- USHORT nPos;
- for ( nPos = 0; nPos < _pTypes->Count(); ++nPos )
- {
- if ( _pTypes->GetObject(nPos)->nId == pDef->GetSlotId() )
- {
- DBG_ASSERT( rTypeId == _pTypes->GetObject(nPos)->nType,
- "same slot id with unequal item types" );
- }
- else if ( _pTypes->GetObject(nPos)->nId > pDef->GetSlotId() )
- break;
- }
- if ( nPos >= _pTypes->Count() ||
- _pTypes->GetObject(nPos)->nId > pDef->GetSlotId() )
- _pTypes->Append( new SfxSlotType_Impl( pDef->GetSlotId(), rTypeId ) );
- }
-#endif
}
}
diff --git a/sfx2/source/doc/DocumentMetadataAccess.cxx b/sfx2/source/doc/DocumentMetadataAccess.cxx
index 4f5387e..f91bfcb 100644
--- a/sfx2/source/doc/DocumentMetadataAccess.cxx
+++ b/sfx2/source/doc/DocumentMetadataAccess.cxx
@@ -175,17 +175,6 @@ uno::Reference<rdf::XURI> createBaseURI(
// if ( pkgURI.getLength() && ::utl::UCBContentHelper::IsFolder(pkgURI) )
if (true) {
xBaseURI.set( xPkgURI, uno::UNO_SET_THROW );
-#if 0
- } else {
- const uno::Reference<uri::XVndSunStarPkgUrlReferenceFactory>
- xPkgUriFactory( xServiceFactory->createInstanceWithContext(
- ::rtl::OUString::createFromAscii(
- "com.sun.star.uri.VndSunStarPkgUrlReferenceFactory"),
- i_xContext),
- uno::UNO_QUERY_THROW);
- xBaseURI.set( xPkgUriFactory->createVndSunStarPkgUrlReference(xPkgURI),
- uno::UNO_SET_THROW );
-#endif
}
::rtl::OUStringBuffer buf;
if (!xBaseURI->getUriReference().endsWithAsciiL("/", 1))
diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx
index 817c5c4..c5945fc 100644
--- a/sfx2/source/doc/Metadatable.cxx
+++ b/sfx2/source/doc/Metadatable.cxx
@@ -1472,19 +1472,6 @@ Metadatable::RegisterAsCopyOf(Metadatable const & i_rSource,
{
OSL_ENSURE(false, "neither RegDoc nor RegClp cannot happen");
}
-#if 0
- {
- //FIXME: do we need this at all???
- XmlIdRegistryDocument & rRegDoc(
- dynamic_cast<XmlIdRegistryDocument&>( rReg ) );
- {
- if (rRegDoc.TryRegisterMetadatable(*this, SourceRef))
- {
- this->m_pReg = &rRegDoc;
- }
- }
- }
-#endif
}
}
catch (uno::Exception &)
diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx
index 78a9dc4..f9111cb 100644
--- a/sfx2/source/doc/SfxDocumentMetaData.cxx
+++ b/sfx2/source/doc/SfxDocumentMetaData.cxx
@@ -2446,26 +2446,4 @@ static ::cppu::ImplementationEntry const entries[] = {
{ 0, 0, 0, 0, 0, 0 }
};
-#if 0
-extern "C" void SAL_CALL component_getImplementationEnvironment(
- const char ** envTypeName, uno_Environment **)
-{
- *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-extern "C" void * SAL_CALL component_getFactory(
- const char * implName, void * serviceManager, void * registryKey)
-{
- return ::cppu::component_getFactoryHelper(
- implName, serviceManager, registryKey, entries);
-}
-
-extern "C" sal_Bool SAL_CALL component_writeInfo(
- void * serviceManager, void * registryKey)
-{
- return ::cppu::component_writeInfoHelper(serviceManager, registryKey,
- entries);
-}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 0335fdf..f2e903e 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -2774,18 +2774,6 @@ void SfxMedium::CloseStreams_Impl()
void SfxMedium::RefreshName_Impl()
{
-#if 0 //(dv)
- if ( pImp->aContent.get().is() )
- {
- String aNameP = pImp->xAnchor->GetViewURL();
- pImp->aOrigURL = aNameP;
- aLogicName = aNameP;
- DELETEZ( pURLObj );
- if (aLogicName.Len())
- aLogicName = GetURLObject().GetMainURL( INetURLObject::NO_DECODE );
- SetIsRemote_Impl();
- }
-#endif //(dv)
}
void SfxMedium::SetIsRemote_Impl()
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index 2d08a98..ce13f6e 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -932,21 +932,6 @@ sal_Bool SfxDocumentTemplates::CopyOrMove
{
DBG_ERRORFILE( "Don't know, what to do!" );
return sal_False;
-#if 0
- // Verschieben einer Vorlage innerhalb eines Bereiches
- // --> nur Verwaltungsdaten aktualisieren
- if ( bMove && nTargetRegion == nSourceRegion )
- {
- if(nTargetIdx == USHRT_MAX)
- nTargetIdx = 0;
- const SfxTemplateDirEntryPtr pEntry = rTargetDir[nSourceIdx];
- rTargetDir.Insert(pEntry, nTargetIdx);
- if(nTargetIdx < nSourceIdx)
- ++nSourceIdx;
- rTargetDir.Remove(nSourceIdx);
- return SaveDir(rTargetDir);
- }
-#endif
}
RegionData_Impl *pSourceRgn = pImp->GetRegion( nSourceRegion );
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 8a1e3c4..a5d66f7 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -820,17 +820,6 @@ void SfxObjectShell::SetTitle
return;
SfxApplication *pSfxApp = SFX_APP();
-#if 0
- // wird 'unbenannt#' als Titel gesetzt
- String aNoName(SfxResId(STR_NONAME));
- if ( rTitle.Match(aNoName) <= aNoName.Len() )
- {
- // er ist es selbst => ignorieren
- pSfxApp->ReleaseIndex(pImp->nVisualDocumentNumber);
- pImp->bIsNamedVisible=0;
- }
-#endif
-
// ggf. die unbenannt-Nummer freigeben
if ( pImp->bIsNamedVisible && USHRT_MAX != pImp->nVisualDocumentNumber )
{
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index ab89ae8..ce99027 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -807,62 +807,6 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed )
if (bReconnectDde)
ReconnectDdeLinks(*this);
-
-#if 0
- if ( pMedium->HasStorage_Impl() )
- {
- uno::Reference< XInteractionHandler > xHandler( pMedium->GetInteractionHandler() );
- if ( xHandler.is() && !SFX_APP()->Get_Impl()->bODFVersionWarningLater )
- {
- uno::Reference<beans::XPropertySet> xStorageProps( pMedium->GetStorage(), uno::UNO_QUERY_THROW );
- ::rtl::OUString sVersion;
- try
- {
- xStorageProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Version" ) ) ) >>= sVersion;
- }
- catch( const uno::Exception& )
- {
- // Custom Property "ODFVersion" does not exist
- }
-
- if ( sVersion.getLength() )
- {
- double nVersion = sVersion.toDouble();
- if ( nVersion > 1.20001 && SfxObjectShell_Impl::NeedsOfficeUpdateDialog() )
- // ODF version greater than 1.2 - added some decimal places to be safe against floating point conversion errors (hack)
- {
- ::rtl::OUString sDocumentURL( pMedium->GetOrigURL() );
- ::rtl::OUString aSystemFileURL;
- if ( osl::FileBase::getSystemPathFromFileURL( sDocumentURL, aSystemFileURL ) == osl::FileBase::E_None )
- sDocumentURL = aSystemFileURL;
-
- FutureDocumentVersionProductUpdateRequest aUpdateRequest;
- aUpdateRequest.Classification = InteractionClassification_QUERY;
- aUpdateRequest.DocumentURL = sDocumentURL;
-
- ::rtl::Reference< ::comphelper::OInteractionRequest > pRequest = new ::comphelper::OInteractionRequest( makeAny( aUpdateRequest ) );
- pRequest->addContinuation( new ::comphelper::OInteractionApprove );
- pRequest->addContinuation( new ::comphelper::OInteractionAbort );
-
- typedef ::comphelper::OInteraction< XInteractionAskLater > OInteractionAskLater;
- OInteractionAskLater* pLater = new OInteractionAskLater;
- pRequest->addContinuation( pLater );
-
- try
- {
- xHandler->handle( pRequest.get() );
- }
- catch( const Exception& )
- {
- DBG_UNHANDLED_EXCEPTION();
- }
- if ( pLater->wasSelected() )
- SFX_APP()->Get_Impl()->bODFVersionWarningLater = true;
- }
- }
- }
- }
-#endif
}
else
GetpApp()->HideStatusText();
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index ef2fe05..bebc12a 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -840,22 +840,6 @@ void SfxObjectShell::InitBasicManager_Impl()
}
//--------------------------------------------------------------------
-#if 0 //(mba)
-SotObjectRef SfxObjectShell::CreateAggObj( const SotFactory* pFact )
-{
- // SvDispatch?
- SotFactory* pDispFact = SvDispatch::ClassFactory();
- if( pFact == pDispFact )
- return( (SfxShellObject*)GetSbxObject() );
-
- // sonst unbekannte Aggregation
- DBG_ERROR("unkekannte Factory");
- SotObjectRef aSvObjectRef;
- return aSvObjectRef;
-}
-#endif
-
-//--------------------------------------------------------------------
sal_uInt16 SfxObjectShell::Count()
{
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index e39d276..dc76b32 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -3393,20 +3393,6 @@ awt::Size SAL_CALL SfxBaseModel::getVisualAreaSize( sal_Int64 /*nAspect*/ )
Rectangle aTmpRect = m_pData->m_pObjectShell->GetVisArea( ASPECT_CONTENT );
-#if 0
- Window* pWindow = NULL;
- SfxViewFrame* pViewFrm = m_pData->m_pObjectShell.Is() ?
- SfxViewFrame::GetFirst( m_pData->m_pObjectShell, 0, sal_False ) : 0;
-
- if ( pWindow )
- {
- MapMode aInternalMapMode( pViewFrm->GetWindow().GetMapMode() );
- MapMode aExternalMapMode( m_pData->m_pObjectShell->GetMapUnit() );
-
- aTmpRect = OutputDevice::LogicToLogic( aTmpRect, aInternalMapMode, aExternalMapMode );
- }
-#endif
-
return awt::Size( aTmpRect.GetWidth(), aTmpRect.GetHeight() );
}
diff --git a/sfx2/source/layout/sfxtabpage.cxx b/sfx2/source/layout/sfxtabpage.cxx
index a7ccaa1..f2e3b71 100644
--- a/sfx2/source/layout/sfxtabpage.cxx
+++ b/sfx2/source/layout/sfxtabpage.cxx
@@ -36,29 +36,6 @@ namespace layout
using namespace ::com::sun::star;
-#if 0
-SfxTabDialog::SfxTabDialog (::Window *parent, char const* xml_file, char const* id, ResId const& res_id, SfxItemSet const* set)
- : ::SfxTabDialog (parent, res_id, set)
- , InPlug (parent, xml_file, id)
-{
-}
-
-::Window* SfxTabDialog::GetParent () const
-{
- return Window::GetParent ();
-}
-
-::Window* SfxTabDialog::GetWindow () const
-{
- return Window::GetParent ();
-}
-
-void SfxTabDialog::FreeResource ()
-{
- //::Window::FreeResource ();
-}
-#endif
-
SfxTabPage::SfxTabPage (::Window *parent, char const* xml_file, char const* id, SfxItemSet const* set)
: ::SfxTabPage (parent, 0, *set)
, InPlug (parent, xml_file, id)
diff --git a/sfx2/source/notify/hintpost.cxx b/sfx2/source/notify/hintpost.cxx
index 44b0579..f77d030 100644
--- a/sfx2/source/notify/hintpost.cxx
+++ b/sfx2/source/notify/hintpost.cxx
@@ -98,13 +98,5 @@ void SfxHintPoster::SetEventHdl( const GenLink& rLink )
#define LOG( x )
-#if 0
-#define LOG( x ) \
-{ \
- SvFileStream aStrm( "f:\\temp\\log", STREAM_READWRITE ); \
- aStrm.Seek( STREAM_SEEK_TO_END ); \
- aStrm << x.GetStr() << '\n'; \
-}
-#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/view/prnmon.cxx b/sfx2/source/view/prnmon.cxx
index 6e49e19..6bab763 100644
--- a/sfx2/source/view/prnmon.cxx
+++ b/sfx2/source/view/prnmon.cxx
@@ -269,13 +269,6 @@ SfxPrintProgress::SfxPrintProgress( SfxViewShell* pViewSh, bool bShow )
String(SfxResId(STR_PRINTING)), 1, FALSE ),
pImp( new SfxPrintProgress_Impl( pViewSh, pViewSh->GetPrinter() ) )
{
- #if 0
- pImp->pPrinter->SetEndPrintHdl( LINK( this, SfxPrintProgress, EndPrintNotify ) );
- pImp->pPrinter->SetErrorHdl( LINK( this, SfxPrintProgress, PrintErrorNotify ) );
- pImp->pPrinter->SetStartPrintHdl( LINK( this, SfxPrintProgress, StartPrintNotify ) );
- pImp->bCallbacks = TRUE;
- #endif
-
SfxObjectShell* pDoc = pViewSh->GetObjectShell();
SFX_ITEMSET_ARG( pDoc->GetMedium()->GetItemSet(), pItem, SfxBoolItem, SID_HIDDEN, FALSE );
if ( pItem && pItem->GetValue() )
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index 19849c7..73dce14 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -928,15 +928,7 @@ PrintDialog* SfxViewShell::CreatePrintDialog( Window* /*pParent*/ )
*/
{
- #if 0
- PrintDialog *pDlg = new PrintDialog( pParent, false );
- pDlg->SetFirstPage( 1 );
- pDlg->SetLastPage( 9999 );
- pDlg->EnableCollate();
- return pDlg;
- #else
return NULL;
- #endif
}
//--------------------------------------------------------------------
@@ -952,42 +944,8 @@ ErrCode SfxViewShell::DoPrint( SfxPrinter* /*pPrinter*/,
PrintDialog* /*pPrintDlg*/,
BOOL /*bSilent*/, BOOL /*bIsAPI*/ )
{
- #if 0
- // Printer-Dialogbox waehrend des Ausdrucks mu\s schon vor
- // StartJob erzeugt werden, da SV bei einem Quit-Event h"angt
- SfxPrintProgress *pProgress = new SfxPrintProgress( this, !bSilent );
- SfxPrinter *pDocPrinter = GetPrinter(TRUE);
- if ( !pPrinter )
- pPrinter = pDocPrinter;
- else if ( pDocPrinter != pPrinter )
- {
- pProgress->RestoreOnEndPrint( pDocPrinter->Clone() );
- SetPrinter( pPrinter, SFX_PRINTER_PRINTER );
- }
- pProgress->SetWaitMode(FALSE);
-
- // Drucker starten
- PreparePrint( pPrintDlg );
- SfxObjectShell *pObjShell = GetViewFrame()->GetObjectShell();
- if ( pPrinter->StartJob(pObjShell->GetTitle(0)) )
- {
- // Drucken
- Print( *pProgress, bIsAPI, pPrintDlg );
- pProgress->Stop();
- pProgress->DeleteOnEndPrint();
- pPrinter->EndJob();
- }
- else
- {
- // Printer konnte nicht gestartet werden
- delete pProgress;
- }
-
- return pPrinter->GetError();
- #else
DBG_ERROR( "DoPrint called, dead code !" );
return ERRCODE_IO_NOTSUPPORTED;
- #endif
}
//--------------------------------------------------------------------
diff --git a/svx/inc/svx/colrctrl.hxx b/svx/inc/svx/colrctrl.hxx
index 5ffcab5..20981d9 100644
--- a/svx/inc/svx/colrctrl.hxx
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list