diff options
| author | Povilas Kanapickas <povilas.kanapickas@gmail.com> | 2010-10-18 19:37:48 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2010-10-18 19:38:00 +0100 |
| commit | bc8fcf207ffeee1dd6fb4a361b0ad5c5def21beb (patch) | |
| tree | 43f54910146344613e641bd0b54cee3069292624 | |
| parent | 34f1c06830ae530bea4f11aca91e2836a53fd764 (diff) | |
remove non-compiled code
104 files changed, 19 insertions, 1783 deletions
diff --git a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx index 95b1ea3c13d9..272ef85822cf 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 8889c22c2632..07fc4ec5e00a 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 b0db7910d4b1..66f3c5fabba5 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 638fcdad51e9..bd161c334760 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 021f09c485bd..74cb8efd4a96 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 25e221ef4870..2a1a0e779b60 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 011518221b9b..9104e3fc1c6b 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 a77da3eb4438..d83d8cef1b02 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 34411f9ed0b6..a4489dcaa351 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 b1591e592473..c5e14f15d64d 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 f7b63bc35814..10a1f36db388 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 7a8e95746d99..6a920de9650c 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 4ffc5442bf4c..dbc489abe9fe 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 990a6258cc8f..48776dc36edb 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 e23a563bd061..dfa7464a3dbf 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 30d885d5fe42..57f7bba52843 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 a7f229e2af33..e33ab4205b1e 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 0e5047084e05..c359b82c07fc 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 1b55777182be..9f719de7abc7 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 6bac155bc602..69e48b736565 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 8826716f1d6f..a9b371dec9fb 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 59e7f036961e..02322e097a03 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 287b5fa5e9b6..817a0ed2b4db 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 c12a90bf724c..0d626c98deab 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 4b3965598023..7f7c2980eced 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 d6512f5b0661..ebe286a7d815 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 e467185afbe8..20425e20339b 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 6a88f7cedad9..02b982a7d4e8 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 fd1eb65d54df..5c22a9b5fc2c 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 53667fbf0aa7..261e62f8aa99 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 f0dd2248c456..58c78c1c05ac 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 89062d7b7263..0ba39ae49798 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 254bd622d9bc..da05ba7c6f7d 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 c80d61aa81d1..eb3e39af27e9 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 d8290c4dbc9e..5cf62ed7ac22 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 bb7524f98d2e..61ec51a42841 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 140e93beafa4..f5d10b0a933d 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 d92ed2ac4ac1..26a523fd332b 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 6b50ddf3497a..9f106a4382e1 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 d9d886cdfd5f..5787d63ea57b 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 0794de2eaffb..043d13c5cd2d 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 fe7d8bb36b1e..48a762f74c52 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 64a90c74684d..740da8a9bde7 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 ad83bb4a7418..36bb274234cc 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 fa30c4849f89..348579dea05b 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 6025925e76bd..f5f15a71afba 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 9c1a3fe0cfff..fd2dfc185d6e 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 26855b82d8c8..bfea4b6e5abf 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 70645f5b08dd..138fa003293e 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 dd8005f8470b..015367ed0bc1 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 ca30d243bbac..5d674123033d 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 93f7e9492b4a..6ae095407516 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 9e2ffdadac4d..7b0a86b25fdd 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 cedc8f256010..ec12da4ca5b2 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 43f31f807a48..649b6a886143 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 f30a544922b5..e0f4c31b431d 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 d4bc360c84c9..7549fb3bc031 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 df8a9378dcd7..dfff1bd62ae0 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 e19a3ea23e84..fe7fb1c7240b 100644 --- a/sfx2/source/appl/appuno.cxx +++ b/sfx2/source/appl/appuno.cxx @@ -2157,17 +2157,6 @@ SFX2_DLLPUBLIC sal_Bool SAL_CALL component_writeInfo( 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("/")); aImpl += ::sfx2::IFrameObject::impl_getStaticImplementationName(); @@ -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 e8440d29ca8b..95a4049da64f 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 b2aac0f43d68..b74109e14b48 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 de878a4c548f..80fe94ce72fe 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 4062bcc1e97d..6bb734c10c76 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 cbb623ce9e60..fc76c7733831 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 78a9dc4e1911..f9111cb7f6bd 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 bcb1981365f5..19ced3f09391 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 d3515420a7ac..953f9de242f6 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 a5b5620539cf..d4f7bc8f17a1 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 e52a926fbc1d..3e0aa30e7ca4 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 92677fa33e08..54e7b93f59e6 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 6b6f41eced87..7ca91f3eb53f 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 d7df62a2d22b..b7a857c6fbde 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 ea24a66ceb35..09299a152102 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 36c3025698b0..200e74475fe1 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 47e8843ac294..6109e7bab7f0 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 e6908d98c152..7b07a04da7a9 100644 --- a/svx/inc/svx/colrctrl.hxx +++ b/svx/inc/svx/colrctrl.hxx @@ -109,7 +109,6 @@ private: Size aColorSize; Size aItemSize; -//#if 0 // _SOLAR__PRIVATE void FillValueSet(); void SetSize(); DECL_LINK( SelectHdl, void * ); @@ -119,7 +118,6 @@ private: the keyboard. */ virtual void GetFocus (void); -//#endif protected: virtual BOOL Close(); diff --git a/svx/inc/svx/contdlg.hxx b/svx/inc/svx/contdlg.hxx index 034ec5485536..ad1d5b07d9be 100644 --- a/svx/inc/svx/contdlg.hxx +++ b/svx/inc/svx/contdlg.hxx @@ -90,14 +90,11 @@ class SVX_DLLPUBLIC SvxContourDlg : public SfxFloatingWindow SvxSuperContourDlg* pSuperClass; -//#if 0 // _SOLAR__PRIVATE protected: void SetSuperClass( SvxSuperContourDlg& rSuperClass ) { pSuperClass = &rSuperClass; } -//#endif // __PRIVATE - public: SvxContourDlg( SfxBindings *pBindings, SfxChildWindow *pCW, diff --git a/svx/inc/svx/fillctrl.hxx b/svx/inc/svx/fillctrl.hxx index 51ee743ca093..4cbce39bd4f8 100644 --- a/svx/inc/svx/fillctrl.hxx +++ b/svx/inc/svx/fillctrl.hxx @@ -91,11 +91,9 @@ private: Size aLogicalAttrSize; Timer aDelayTimer; -//#if 0 // _SOLAR__PRIVATE DECL_LINK( DelayHdl, Timer * ); DECL_LINK( SelectFillTypeHdl, ListBox * ); DECL_LINK( SelectFillAttrHdl, ListBox * ); -//#endif virtual void DataChanged( const DataChangedEvent& rDCEvt ); public: FillControl( Window* pParent, WinBits nStyle = 0 ); diff --git a/svx/inc/svx/fntctl.hxx b/svx/inc/svx/fntctl.hxx index f28e158df1df..30761b3f3994 100644 --- a/svx/inc/svx/fntctl.hxx +++ b/svx/inc/svx/fntctl.hxx @@ -46,13 +46,11 @@ private: FontNameMenu* pMenu; Menu& rParent; -//#if 0 // _SOLAR__PRIVATE SVX_DLLPRIVATE void FillMenu(); DECL_LINK( MenuSelect, FontNameMenu * ); SVX_DLLPRIVATE virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); SVX_DLLPRIVATE virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); -//#endif public: SvxFontMenuControl( USHORT nId, Menu&, SfxBindings& ); diff --git a/svx/inc/svx/fntszctl.hxx b/svx/inc/svx/fntszctl.hxx index dfeec808e602..76fccbec4997 100644 --- a/svx/inc/svx/fntszctl.hxx +++ b/svx/inc/svx/fntszctl.hxx @@ -46,9 +46,7 @@ private: Menu& rParent; SfxStatusForwarder aFontNameForwarder; -//#if 0 // _SOLAR__PRIVATE DECL_LINK( MenuSelect, FontSizeMenu * ); -//#endif protected: virtual void StateChanged( USHORT nSID, SfxItemState eState, diff --git a/svx/inc/svx/graphctl.hxx b/svx/inc/svx/graphctl.hxx index f71f7fe6c43c..f544bf5bdecb 100644 --- a/svx/inc/svx/graphctl.hxx +++ b/svx/inc/svx/graphctl.hxx @@ -140,7 +140,6 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); }; -//#if 0 // _SOLAR__PRIVATE /************************************************************************* |* @@ -187,7 +186,5 @@ public: virtual ~GraphCtrlView() {}; }; -//#endif // __PRIVATE - #endif // _GRAPHCTL_HXX diff --git a/svx/inc/svx/ruler.hxx b/svx/inc/svx/ruler.hxx index d27f3a079495..784caa5d4a80 100644 --- a/svx/inc/svx/ruler.hxx +++ b/svx/inc/svx/ruler.hxx @@ -99,7 +99,6 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener BOOL bValid; BOOL bListening; BOOL bActive; -//#if 0 // _SOLAR__PRIVATE void StartListening_Impl(); long GetCorrectedDragPos( BOOL bLeft = TRUE, BOOL bRight = TRUE ); void DrawLine_Impl(long &lTabPos, int, BOOL Hori=TRUE); @@ -194,7 +193,6 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener USHORT GetNextVisible(USHORT nColumn); USHORT GetPrevVisible(USHORT nColumn); -//#endif void Update(); diff --git a/svx/inc/svx/svdetc.hxx b/svx/inc/svx/svdetc.hxx index ffd3b1782004..8fde823a4816 100644 --- a/svx/inc/svx/svdetc.hxx +++ b/svx/inc/svx/svdetc.hxx @@ -144,9 +144,7 @@ class ContainerSorter { protected: Container& rCont; private: -//#if 0 // _SOLAR__PRIVATE void ImpSubSort(long nL, long nR) const; -//#endif // __PRIVATE public: ContainerSorter(Container& rNewCont): rCont(rNewCont) {} void DoSort(ULONG a=0, ULONG b=0xFFFFFFFF) const; @@ -166,7 +164,6 @@ virtual //////////////////////////////////////////////////////////////////////////////////////////////////// -//#if 0 // _SOLAR__PRIVATE #define SDRHDC_SAVEPEN 1 /* Save Linecolor */ #define SDRHDC_SAVEBRUSH 2 /* Save Fillcolorn */ #define SDRHDC_SAVEFONT 4 /* Save Font */ @@ -190,7 +187,6 @@ public: bool IsSaved() const { return pFarbMerk!=NULL || pClipMerk!=NULL || pLineColorMerk!=NULL; } void Restore(OutputDevice& rOut, USHORT nMask=SDRHDC_SAVEALL) const; }; -//#endif // __PRIVATE //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/svx/inc/svx/svdmodel.hxx b/svx/inc/svx/svdmodel.hxx index 8f79bdb1f007..7c1922e15c38 100644 --- a/svx/inc/svx/svdmodel.hxx +++ b/svx/inc/svx/svdmodel.hxx @@ -311,7 +311,6 @@ private: SVX_DLLPRIVATE SdrModel(const SdrModel& rSrcModel); SVX_DLLPRIVATE void operator=(const SdrModel& rSrcModel); SVX_DLLPRIVATE bool operator==(const SdrModel& rCmpModel) const; -//#if 0 // _SOLAR__PRIVATE SVX_DLLPRIVATE void ImpPostUndoAction(SdrUndoAction* pUndo); SVX_DLLPRIVATE void ImpSetUIUnit(); SVX_DLLPRIVATE void ImpSetOutlinerDefaults( SdrOutliner* pOutliner, BOOL bInit = FALSE ); @@ -321,16 +320,13 @@ private: SVX_DLLPRIVATE void ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, bool bUseExtColorTable, bool bLoadRefCounts = true); -//#endif // __PRIVATE // this is a weak reference to a possible living api wrapper for this model ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxUnoModel; public: -//#if 0 // _SOLAR__PRIVATE bool IsPasteResize() const { return bPasteResize; } void SetPasteResize(bool bOn) { bPasteResize=bOn; } -//#endif // __PRIVATE TYPEINFO(); // Steckt man hier seinen eigenen Pool rein, so wird die Klasse auch // Aktionen an ihm vornehmen (Put(),Remove()). Bei Zerstoerung von diff --git a/svx/inc/svx/svdpage.hxx b/svx/inc/svx/svdpage.hxx index 6f7347998a40..27faec52859e 100644 --- a/svx/inc/svx/svdpage.hxx +++ b/svx/inc/svx/svdpage.hxx @@ -519,10 +519,8 @@ public: void TRG_SetMasterPageVisibleLayers(const SetOfByte& rNew); sdr::contact::ViewContact& TRG_GetMasterPageDescriptorViewContact() const; -//#if 0 // _SOLAR__PRIVATE protected: void TRG_ImpMasterPageRemoved(const SdrPage& rRemovedPage); -//#endif // __PRIVATE public: // Aenderungen an den Layern setzen nicht das Modified-Flag ! diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx index f80e02e8d526..9a7f9b09e25e 100644 --- a/svx/source/dialog/framelink.cxx +++ b/svx/source/dialog/framelink.cxx @@ -613,44 +613,6 @@ void lclLinkVerFrameBorder( // ============================================================================ -#if 0 -// Not used anymore, but not deleted for possible future usage. - -/** Returns the relative Y offset of the intercept point of 2 diagonal borders. - - @param nTLBROffs - Width offset (sub units) across the top-left to bottom-right frame border. - @param fTLBRAngle - Inner angle between horizontal and top-left to bottom-right frame border. - @param nBLTROffs - Width offset (sub units) across the bottom-left to top-right frame border. - @param fBLTRAngle - Inner angle between horizontal and bottom-left to top-right frame border. - @return - Offset (sub units) relative to the Y position of the centered intercept - point of both diagonal frame borders. - */ -long lclGetDiagDiagOffset( long nTLBROffs, double fTLBRAngle, long nBLTROffs, double fBLTRAngle ) -{ - double fASin = sin( fTLBRAngle ); - double fACos = cos( fTLBRAngle ); - double fAX = -nTLBROffs * fASin; - double fAY = nTLBROffs * fACos; - double fRAX = fACos; - double fRAY = fASin; - - double fBSin = sin( fBLTRAngle ); - double fBCos = cos( fBLTRAngle ); - double fBX = nBLTROffs * fBSin; - double fBY = nBLTROffs * fBCos; - double fRBX = fBCos; - double fRBY = -fBSin; - - double fKA = (fRBX * (fBY - fAY) - fRBY * (fBX - fAX)) / (fRBX * fRAY - fRAX * fRBY); - return lclD2L( fAY + fKA * fRAY ); -} -#endif - // ---------------------------------------------------------------------------- // Linking of diagonal frame borders. diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx index 27f5135d242f..2d24e8f88525 100644 --- a/svx/source/items/numfmtsh.cxx +++ b/svx/source/items/numfmtsh.cxx @@ -1605,9 +1605,6 @@ void SvxNumberFormatShell::GetCurrencySymbols( SvStringsDtor& rList, sal_Bool bF aStr += ApplyLreOrRleEmbedding( pLanguageTable->GetString( rCurrencyTable[i]->GetLanguage())); pStr = new XubString(aStr); -#if 0 - fprintf( stderr, "currency entry: %s\n", ByteString( *pStr, RTL_TEXTENCODING_UTF8).GetBuffer()); -#endif for(j=nStart;j<rList.Count();j++) { const StringPtr pTestStr=rList[j]; diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx index beafe24c1579..2acea4be6b69 100644 --- a/svx/source/svdraw/svdedtv1.cxx +++ b/svx/source/svdraw/svdedtv1.cxx @@ -1537,20 +1537,6 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr) // linear combination will not decompose to the same start values again, but to a // new combination. Thus it makes no sense to check if the wanted shear is reached // or not. Taking out. -#if 0 - long nTempAngle=GetMarkedObjShear(); - if (nTempAngle!=0 && nTempAngle!=nNewShearAngle && !bShearVert) { - // noch eine 2. Iteration zur Kompensation der Rundungsfehler - double nOld=tan((double)nTempAngle*nPi180); - double nNew=tan((double)nNewShearAngle*nPi180); - nNew-=nOld; - nNew=atan(nNew)/nPi180; - nTempAngle=Round(nNew); - if (nTempAngle!=0) { - ShearMarkedObj(aRef,nTempAngle,bShearVert); - } - } -#endif } // Position aendern diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx index e66e0e396c16..e9c5546dc496 100644 --- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx +++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx @@ -122,12 +122,6 @@ HierarchyContent* HierarchyContent::create( RTL_CONSTASCII_STRINGPARAM( HIERARCHY_LINK_CONTENT_TYPE ) ) ) return 0; -#if 0 - // Fail, if content does exist. - if ( hasData( rxSMgr, pProvider, Identifier ) ) - return 0; -#endif - return new HierarchyContent( rxSMgr, pProvider, Identifier, Info ); } diff --git a/ucb/source/ucp/hierarchy/hierarchydata.cxx b/ucb/source/ucp/hierarchy/hierarchydata.cxx index 198f79f1953c..82bd9e6df98d 100644 --- a/ucb/source/ucp/hierarchy/hierarchydata.cxx +++ b/ucb/source/ucp/hierarchy/hierarchydata.cxx @@ -525,15 +525,6 @@ sal_Bool HierarchyEntry::move( if ( aNewPath == m_aPath ) return sal_True; -#if 0 - // In the "near future"... ( not yet implemented in config db ) - - - get update access for m_aPath - - update access -> XNamed - - xNamed::setName( newName ) - - updateaccess commit -#else - sal_Bool bOldRoot = sal_True; uno::Reference< util::XChangesBatch > xOldParentBatch; @@ -825,30 +816,6 @@ sal_Bool HierarchyEntry::move( return sal_False; } -#if 0 - ////////////////////////////////////////////////////////////////////// - // (4) Commit changes... - ////////////////////////////////////////////////////////////////////// - - try - { - xNewParentBatch->commitChanges(); - - if ( bDifferentParents ) - xOldParentBatch->commitChanges(); - } - catch ( lang::WrappedTargetException const & ) - { - // commitChanges - - OSL_ENSURE( sal_False, - "HierarchyEntry::move - caught WrappedTargetException!" ); - return sal_False; - } -#endif - - return sal_True; -#endif } //========================================================================= diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx index 67b2a36294cc..1e5fdbfc3e79 100644 --- a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx +++ b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx @@ -165,21 +165,9 @@ void SAL_CALL HierarchyContentProvider::initialize( const uno::Sequence< uno::Any >& aArguments ) throw( uno::Exception, uno::RuntimeException ) { -#if 0 - if ( aArguments.getLength() > 0 ) - { - // Extract config provider from service init args. - aArguments[ 0 ] >>= m_xConfigProvider; - - OSL_ENSURE( m_xConfigProvider.is(), - "HierarchyContentProvider::initialize - " - "No config provider!" ); - } -#else if ( aArguments.getLength() > 0 ) OSL_ENSURE( false, "HierarchyContentProvider::initialize : not supported!" ); -#endif } //========================================================================= diff --git a/ucb/source/ucp/odma/odma_content.cxx b/ucb/source/ucp/odma/odma_content.cxx index 9c3d8492e3fe..f1cd571dd10f 100644 --- a/ucb/source/ucp/odma/odma_content.cxx +++ b/ucb/source/ucp/odma/odma_content.cxx @@ -124,10 +124,6 @@ uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType ) uno::Any aRet; // @@@ Add support for additional interfaces. -#if 0 - aRet = cppu::queryInterface( rType, - static_cast< yyy::Xxxxxxxxx * >( this ) ); -#endif return aRet.hasValue() ? aRet : ContentImplHelper::queryInterface( rType ); } @@ -944,59 +940,6 @@ uno::Sequence< uno::Any > Content::setPropertyValues( return aRet; } - -#if 0 -//========================================================================= -void Content::queryChildren( ContentRefList& rChildren ) -{ - // @@@ Adapt method to your URL scheme... - - // Obtain a list with a snapshot of all currently instanciated contents - // from provider and extract the contents which are direct children - // of this content. - - ::ucbhelper::ContentRefList aAllContents; - m_xProvider->queryExistingContents( aAllContents ); - - OUString aURL = m_xIdentifier->getContentIdentifier(); - sal_Int32 nPos = aURL.lastIndexOf( '/' ); - - if ( nPos != ( aURL.getLength() - 1 ) ) - { - // No trailing slash found. Append. - aURL += OUString::createFromAscii( "/" ); - } - - sal_Int32 nLen = aURL.getLength(); - - ::ucbhelper::ContentRefList::const_iterator it = aAllContents.begin(); - ::ucbhelper::ContentRefList::const_iterator end = aAllContents.end(); - - while ( it != end ) - { - ::ucbhelper::ContentImplHelperRef xChild = (*it); - OUString aChildURL = xChild->getIdentifier()->getContentIdentifier(); - - // Is aURL a prefix of aChildURL? - if ( ( aChildURL.getLength() > nLen ) && - ( aChildURL.compareTo( aURL, nLen ) == 0 ) ) - { - sal_Int32 nPos = nLen; - nPos = aChildURL.indexOf( '/', nPos ); - - if ( ( nPos == -1 ) || - ( nPos == ( aChildURL.getLength() - 1 ) ) ) - { - // No further slashes / only a final slash. It's a child! - rChildren.push_back( - ContentRef( - static_cast< Content * >( xChild.get() ) ) ); - } - } - ++it; - } -} -#endif //========================================================================= void Content::insert( const uno::Reference< io::XInputStream > & xInputStream, @@ -1062,34 +1005,6 @@ void Content::insert( aGuard.clear(); inserted(); } -#if 0 -//========================================================================= -void Content::destroy( sal_Bool bDeletePhysical ) - throw( uno::Exception ) -{ - // @@@ take care about bDeletePhysical -> trashcan support - - uno::Reference< ucb::XContent > xThis = this; - - deleted(); - - osl::Guard< osl::Mutex > aGuard( m_aMutex ); - - // Process instanciated children... - - ContentRefList aChildren; - queryChildren( aChildren ); - - ContentRefList::const_iterator it = aChildren.begin(); - ContentRefList::const_iterator end = aChildren.end(); - - while ( it != end ) - { - (*it)->destroy( bDeletePhysical ); - ++it; - } -} -#endif // ----------------------------------------------------------------------------- ::rtl::OUString Content::openDoc() diff --git a/ucb/source/ucp/odma/odma_provider.cxx b/ucb/source/ucp/odma/odma_provider.cxx index f08021cceaf4..84c7038108b0 100644 --- a/ucb/source/ucp/odma/odma_provider.cxx +++ b/ucb/source/ucp/odma/odma_provider.cxx @@ -191,21 +191,10 @@ uno::Reference< ucb::XContent > SAL_CALL ContentProvider::queryContent( sCanonicURL.matchIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(ODMA_URL_SCHEME ODMA_URL_SHORT)))) throw ucb::IllegalIdentifierException(); - // @@@ Further id checks may go here... -#if 0 - if ( id-check-failes ) - throw ucb::IllegalIdentifierException(); -#endif // @@@ Id normalization may go here... -#if 0 - // Normalize URL and create new Id. - rtl::OUString aCanonicURL = ( Identifier->getContentIdentifier() ); - uno::Reference< ucb::XContentIdentifier > xCanonicId - = new ::ucb::ContentIdentifier( m_xSMgr, aCanonicURL ); -#else + uno::Reference< ucb::XContentIdentifier > xCanonicId = Identifier; -#endif osl::MutexGuard aGuard( m_aMutex ); diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx index 1b9c75010656..349d613a470b 100644 --- a/ucb/source/ucp/package/pkgcontent.cxx +++ b/ucb/source/ucp/package/pkgcontent.cxx @@ -234,13 +234,7 @@ Content* Content::create( uno::Reference< container::XHierarchicalNameAccess > xPackage; -#if 0 - // Fail, if content does exist. - if ( hasData( pProvider, aURI, xPackage ) ) - return 0; -#else xPackage = pProvider->createPackage( aURI.getPackage(), aURI.getParam() ); -#endif uno::Reference< ucb::XContentIdentifier > xId = new ::ucbhelper::ContentIdentifier( rxSMgr, aURI.getUri() ); diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx index 4fa081793f74..2a50f8d051b3 100644 --- a/ucb/source/ucp/tdoc/tdoc_content.cxx +++ b/ucb/source/ucp/tdoc/tdoc_content.cxx @@ -147,13 +147,6 @@ Content* Content::create( return 0; } -#if 0 - // Fail, if content does exist. - if ( Content::hasData( pProvider, - Uri( Identifier->getContentIdentifier() ) ) ) - return 0; -#endif - return new Content( rxSMgr, pProvider, Identifier, Info ); } diff --git a/ucb/source/ucp/webdav/NeonSession.cxx b/ucb/source/ucp/webdav/NeonSession.cxx index 78247249c032..958b26dca153 100644 --- a/ucb/source/ucp/webdav/NeonSession.cxx +++ b/ucb/source/ucp/webdav/NeonSession.cxx @@ -263,15 +263,6 @@ extern "C" int NeonSession_NeonAuth( void * inUserData, * cancel the request. (if non-zero, username and password are * ignored.) */ -#if 0 - // Give'em only a limited mumber of retries.. - if ( attempt > 9 ) - { - // abort - return -1; - } -#endif - NeonSession * theSession = static_cast< NeonSession * >( inUserData ); DAVAuthListener * pListener = theSession->getRequestEnvironment().m_xAuthListener.get(); diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx index 31be23798dd6..e7f36d16a619 100644 --- a/ucb/source/ucp/webdav/webdavcontent.cxx +++ b/ucb/source/ucp/webdav/webdavcontent.cxx @@ -852,27 +852,6 @@ void SAL_CALL Content::removeProperty( const rtl::OUString& Name ) // XCommandProcessor commands! uno::Reference< ucb::XCommandEnvironment > xEnv; -#if 0 - // @@@ REMOVEABLE z.Z. nicht richtig an der PropSetInfo gesetzt!!! - try - { - beans::Property aProp - = getPropertySetInfo( xEnv, sal_False /* don't cache data */ ) - ->getPropertyByName( Name ); - - if ( !( aProp.Attributes & beans::PropertyAttribute::REMOVEABLE ) ) - { - // Not removeable! - throw beans::NotRemoveableException(); - } - } - catch ( beans::UnknownPropertyException const & ) - { - //OSL_ENSURE( sal_False, "removeProperty - Unknown property!" ); - throw; - } -#endif - ////////////////////////////////////////////////////////////////////// // Try to remove property from server. ////////////////////////////////////////////////////////////////////// diff --git a/ucb/workben/ucb/ucbdemo.cxx b/ucb/workben/ucb/ucbdemo.cxx index da536a28baf4..32f253f1be47 100644 --- a/ucb/workben/ucb/ucbdemo.cxx +++ b/ucb/workben/ucb/ucbdemo.cxx @@ -439,21 +439,11 @@ sal_Bool Ucb::init() aArgs[1] <<= m_aConfigurationKey2; aArgs[2] <<= rtl::OUString::createFromAscii("PIPE"); aArgs[3] <<= aPipe; -#if 0 - m_xProv - = uno::Reference< XContentProvider >( - m_xFac-> - createInstanceWithArguments( - rtl::OUString::createFromAscii( - "com.sun.star.ucb." - "UniversalContentBroker"), - aArgs), - uno::UNO_QUERY); -#else + ::ucbhelper::ContentBroker::initialize( m_xFac, aArgs ); m_xProv = ::ucbhelper::ContentBroker::get()->getContentProviderInterface(); -#endif + } catch (uno::Exception const &) {} @@ -1311,36 +1301,6 @@ void UcbContent::transfer( const rtl::OUString& rSourceURL, sal_Bool bMove ) m_rUCB.getContentProvider(), uno::UNO_QUERY ); if ( xCommandProcessor.is() ) { - -#if 0 - ucb::Command aCommand( - rtl::OUString::createFromAscii( "getCommandInfo" ), -1, Any() ); - uno::Reference< ucb::XCommandInfo > xInfo; - xCommandProcessor->execute( - aCommand, 0, uno::Reference< ucb::XCommandEnvironment >() ) - >>= xInfo; - if ( xInfo.is() ) - { - ucb::CommandInfo aInfo - = xInfo->getCommandInfoByName( - rtl::OUString::createFromAscii( "globalTransfer" ) ); - - uno::Sequence< ucb::CommandInfo > aCommands - = xInfo->getCommands(); - const ucb::CommandInfo* pCommands = aCommands.getConstArray(); - - String aText( UniString::CreateFromAscii( - RTL_CONSTASCII_STRINGPARAM( "Commands:\n" ) ) ); - sal_uInt32 nCount = aCommands.getLength(); - for ( sal_uInt32 n = 0; n < nCount; ++n ) - { - aText.AppendAscii( RTL_CONSTASCII_STRINGPARAM( " " ) ); - aText += String( pCommands[ n ].Name ); - aText += '\n'; - } - print( aText ); - } -#endif ucb::GlobalTransferCommandArgument aArg( bMove ? ucb::TransferCommandOperation_MOVE : ucb::TransferCommandOperation_COPY, diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx index 94e6f385afb4..c649056c52a5 100644 --- a/uui/source/iahndl.cxx +++ b/uui/source/iahndl.cxx @@ -868,16 +868,6 @@ UUIInteractionHelper::handleRequest_impl( if ( handleCertificateValidationRequest( rRequest ) ) return true; -// @@@ Todo #i29340#: activate! -#if 0 - ucb::NameClashResolveRequest aNameClashResolveRequest; - if (aAnyRequest >>= aNameClashResolveRequest) - { - handleNameClashResolveRequest(aNameClashResolveRequest, - rRequest->getContinuations()); - return true; - } -#endif if ( handleMasterPasswordRequest( rRequest ) ) return true; @@ -1189,109 +1179,8 @@ executeMessageBox( return aResult; } -// @@@ Todo #i29340#: activate! -#if 0 -enum NameClashResolveDialogResult { ABORT, RENAME, OVERWRITE }; - -NameClashResolveDialogResult -executeNameClashResolveDialog( - Window * /*pParent*/, - rtl::OUString const & /*rTargetFolderURL*/, - rtl::OUString const & /*rClashingName*/, - rtl::OUString & /*rProposedNewName*/) -{ - // @@@ Todo DV: execute overwrite-rename dialog, deliver result - OSL_ENSURE( false, - "executeNameClashResolveDialog not yet implemented!" ); - return ABORT; -} - -NameClashResolveDialogResult -executeSimpleNameClashResolveDialog( - Window * /*pParent*/, - rtl::OUString const & /*rTargetFolderURL*/, - rtl::OUString const & /*rClashingName*/, - rtl::OUString & /*rProposedNewName*/) -{ - // @@@ Todo DV: execute rename-only dialog, deliver result - OSL_ENSURE( false, - "executeSimpleNameClashResolveDialog not yet implemented!" ); - return ABORT; -} -#endif } // namespace -// @@@ Todo #i29340#: activate! -#if 0 -void -UUIInteractionHelper::handleNameClashResolveRequest( - ucb::NameClashResolveRequest const & rRequest, - uno::Sequence< uno::Reference< - task::XInteractionContinuation > > const & rContinuations) - SAL_THROW((uno::RuntimeException)) -{ - OSL_ENSURE( - rRequest.TargetFolderURL.getLength() > 0, - "NameClashResolveRequest must not contain empty TargetFolderURL" ); - - OSL_ENSURE( - rRequest.ClashingName.getLength() > 0, - "NameClashResolveRequest must not contain empty ClashingName" ); - - uno::Reference< task::XInteractionAbort > xAbort; - uno::Reference< ucb::XInteractionSupplyName > xSupplyName; - uno::Reference< ucb::XInteractionReplaceExistingData > xReplaceExistingData; - getContinuations( - rContinuations, &xAbort, &xSupplyName, &xReplaceExistingData); - - OSL_ENSURE( xAbort.is(), - "NameClashResolveRequest must contain Abort continuation" ); - - OSL_ENSURE( xSupplyName.is(), - "NameClashResolveRequest must contain SupplyName continuation" ); - - NameClashResolveDialogResult eResult = ABORT; - rtl::OUString aProposedNewName( rRequest.ProposedNewName ); - if ( xReplaceExistingData.is() ) - eResult = executeNameClashResolveDialog( - getParentProperty(), - rRequest.TargetFolderURL, - rRequest.ClashingName, - aProposedNewName); - else - eResult = executeSimpleNameClashResolveDialog( - getParentProperty(), - rRequest.TargetFolderURL, - rRequest.ClashingName, - aProposedNewName); - - switch ( eResult ) - { - case ABORT: - xAbort->select(); - break; - - case RENAME: - xSupplyName->setName( aProposedNewName ); - xSupplyName->select(); - break; - - case OVERWRITE: - OSL_ENSURE( - xReplaceExistingData.is(), - "Invalid NameClashResolveDialogResult: OVERWRITE - " - "No ReplaceExistingData continuation available!" ); - xReplaceExistingData->select(); - break; - - default: - OSL_ENSURE( false, "Unknown NameClashResolveDialogResult value. " - "Interaction Request not handled!" ); - break; - } -} -#endif - void UUIInteractionHelper::handleGenericErrorRequest( sal_Int32 nErrorCode, diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx index 581099462845..f9df9c0312a8 100644 --- a/uui/source/iahndl.hxx +++ b/uui/source/iahndl.hxx @@ -215,18 +215,6 @@ private: com::sun::star::task::XInteractionRequest > const & rRequest) SAL_THROW((com::sun::star::uno::RuntimeException)); -// @@@ Todo #i29340#: activate! -#if 0 - void - handleNameClashResolveRequest( - com::sun::star::ucb::NameClashResolveRequest const & rRequest, - com::sun::star::uno::Sequence< - com::sun::star::uno::Reference< - com::sun::star::task::XInteractionContinuation > > const & - rContinuations) - SAL_THROW((com::sun::star::uno::RuntimeException)); -#endif - bool handleMasterPasswordRequest( com::sun::star::uno::Reference< diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index 6f3c881a3ae5..04a3f00a6753 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -1248,19 +1248,6 @@ void SvXMLExport::ImplExportAutoStyles( sal_Bool ) SvXMLElementExport aElem( *this, XML_NAMESPACE_OFFICE, XML_AUTOMATIC_STYLES, sal_True, sal_True ); -#if 0 - AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE ); - AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, XML_STYLES_HREF ); - AddAttribute( XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONLOAD ); - AddAttribute( XML_NAMESPACE_XLINK, XML_ROLE, - pNamespaceMap->GetQNameByKey( XML_NAMESPACE_OFFICE, - GetXMLToken(XML_STYLESHEET)) ); - { - // <style:use-styles> - SvXMLElementExport aElem( *this, XML_NAMESPACE_OFFICE, - XML_USE_STYLES, sal_True, sal_True ); - } -#endif _ExportAutoStyles(); } } @@ -1275,19 +1262,6 @@ void SvXMLExport::ImplExportMasterStyles( sal_Bool ) _ExportMasterStyles(); } -#if 0 - AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE ); - AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, XML_AUTO_STYLES_HREF ); - AddAttribute( XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONLOAD ); - AddAttribute( XML_NAMESPACE_XLINK, XML_ROLE, - pNamespaceMap->GetQNameByKey( XML_NAMESPACE_OFFICE, - GetXMLToken(XML_STYLESHEET) ) ); - { - // <style:use-styles> - SvXMLElementExport aElem( *this, XML_NAMESPACE_OFFICE, - XML_USE_STYLES, sal_True, sal_True ); - } -#endif } void SvXMLExport::ImplExportContent() diff --git a/xmloff/source/meta/MetaExportComponent.cxx b/xmloff/source/meta/MetaExportComponent.cxx index f96b38c5cbf6..1c78dc98fbe4 100644 --- a/xmloff/source/meta/MetaExportComponent.cxx +++ b/xmloff/source/meta/MetaExportComponent.cxx @@ -141,17 +141,7 @@ sal_uInt32 XMLMetaExportComponent::exportDoc( enum XMLTokenEnum ) xDocHandler->startDocument(); { -#if 0 - GetAttrList().AddAttribute( - GetNamespaceMap().GetAttrNameByKey( XML_NAMESPACE_DC ), - GetNamespaceMap().GetNameByKey( XML_NAMESPACE_DC ) ); - GetAttrList().AddAttribute( - GetNamespaceMap().GetAttrNameByKey( XML_NAMESPACE_META ), - GetNamespaceMap().GetNameByKey( XML_NAMESPACE_META ) ); - GetAttrList().AddAttribute( - GetNamespaceMap().GetAttrNameByKey( XML_NAMESPACE_OFFICE ), - GetNamespaceMap().GetNameByKey( XML_NAMESPACE_OFFICE ) ); -#else + const SvXMLNamespaceMap& rMap = GetNamespaceMap(); sal_uInt16 nPos = rMap.GetFirstKey(); while( USHRT_MAX != nPos ) @@ -159,7 +149,6 @@ sal_uInt32 XMLMetaExportComponent::exportDoc( enum XMLTokenEnum ) GetAttrList().AddAttribute( rMap.GetAttrNameByKey( nPos ), rMap.GetNameByKey( nPos ) ); nPos = GetNamespaceMap().GetNextKey( nPos ); } -#endif const sal_Char* pVersion = 0; switch( getDefaultVersion() ) diff --git a/xmloff/source/style/styleexp.cxx b/xmloff/source/style/styleexp.cxx index cb403008b424..29e126fe7310 100644 --- a/xmloff/source/style/styleexp.cxx +++ b/xmloff/source/style/styleexp.cxx @@ -384,32 +384,6 @@ sal_Bool XMLStyleExport::exportDefaultStyle( return sal_True; } -#if 0 -void XMLStyleExport::exportStyleFamily( - const sal_Char *pFamily, - const OUString& rXMLFamily, - const UniReference < XMLPropertySetMapper >& rPropMapper, - sal_Bool bUsed, sal_uInt16 nFamily, const OUString* pPrefix) -{ - const OUString sFamily(OUString::createFromAscii(pFamily )); - UniReference < SvXMLExportPropertyMapper > xExpPropMapper = - new SvXMLExportPropertyMapper( rPropMapper ); - exportStyleFamily( sFamily, rXMLFamily, xExpPropMapper, bUsed, nFamily, - pPrefix); -} - -void XMLStyleExport::exportStyleFamily( - const OUString& rFamily, const OUString& rXMLFamily, - const UniReference < XMLPropertySetMapper >& rPropMapper, - sal_Bool bUsed, sal_uInt16 nFamily, const OUString* pPrefix) -{ - UniReference < SvXMLExportPropertyMapper > xExpPropMapper = - new SvXMLExportPropertyMapper( rPropMapper ); - exportStyleFamily( rFamily, rXMLFamily, xExpPropMapper, bUsed, nFamily, - pPrefix); -} -#endif - void XMLStyleExport::exportStyleFamily( const sal_Char *pFamily, const OUString& rXMLFamily, diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx index 71fc599d9565..32610072b572 100644 --- a/xmloff/source/style/xmlnumfi.cxx +++ b/xmloff/source/style/xmlnumfi.cxx @@ -1123,25 +1123,16 @@ void SvXMLNumFmtElementContext::EndElement() case XML_TOK_STYLE_DAY: rParent.UpdateCalendar( sCalendar ); -#if 0 //! I18N doesn't provide SYSTEM or extended date information yet - if ( rParent.IsFromSystem() ) - bEffLong = SvXMLNumFmtDefaults::IsSystemLongDay( rParent.GetInternational(), bLong ); -#endif + rParent.AddNfKeyword( sal::static_int_cast< sal_uInt16 >( bEffLong ? NF_KEY_DD : NF_KEY_D ) ); break; case XML_TOK_STYLE_MONTH: rParent.UpdateCalendar( sCalendar ); -#if 0 //! I18N doesn't provide SYSTEM or extended date information yet - if ( rParent.IsFromSystem() ) - { - bEffLong = SvXMLNumFmtDefaults::IsSystemLongMonth( rParent.GetInternational(), bLong ); - bTextual = SvXMLNumFmtDefaults::IsSystemTextualMonth( rParent.GetInternational(), bLong ); - } -#endif + rParent.AddNfKeyword( sal::static_int_cast< sal_uInt16 >( bTextual @@ -1150,11 +1141,7 @@ void SvXMLNumFmtElementContext::EndElement() break; case XML_TOK_STYLE_YEAR: rParent.UpdateCalendar( sCalendar ); -#if 0 //! I18N doesn't provide SYSTEM or extended date information yet - if ( rParent.IsFromSystem() ) - bEffLong = SvXMLNumFmtDefaults::IsSystemLongYear( rParent.GetInternational(), bLong ); -#endif // Y after G (era) is replaced by E if ( rParent.HasEra() ) rParent.AddNfKeyword( @@ -1167,11 +1154,7 @@ void SvXMLNumFmtElementContext::EndElement() break; case XML_TOK_STYLE_ERA: rParent.UpdateCalendar( sCalendar ); -#if 0 //! I18N doesn't provide SYSTEM or extended date information yet - if ( rParent.IsFromSystem() ) - bEffLong = SvXMLNumFmtDefaults::IsSystemLongEra( rParent.GetInternational(), bLong ); -#endif rParent.AddNfKeyword( sal::static_int_cast< sal_uInt16 >( bEffLong ? NF_KEY_GGG : NF_KEY_G ) ); @@ -1179,11 +1162,7 @@ void SvXMLNumFmtElementContext::EndElement() break; case XML_TOK_STYLE_DAY_OF_WEEK: rParent.UpdateCalendar( sCalendar ); -#if 0 //! I18N doesn't provide SYSTEM or extended date information yet - if ( rParent.IsFromSystem() ) - bEffLong = SvXMLNumFmtDefaults::IsSystemLongDayOfWeek( rParent.GetInternational(), bLong ); -#endif rParent.AddNfKeyword( sal::static_int_cast< sal_uInt16 >( bEffLong ? NF_KEY_NNNN : NF_KEY_NN ) ); @@ -1740,58 +1719,7 @@ sal_Int32 SvXMLNumFormatContext::CreateAndInsert(SvNumberFormatter* pFormatter) } } -#if 0 //! I18N doesn't provide SYSTEM or extended date information yet - if ( nIndex != NUMBERFORMAT_ENTRY_NOT_FOUND && !bFromSystem ) - { - // instead of automatic date format, use fixed formats if bFromSystem is not set - //! prevent use of automatic formats in other cases, force user-defined format? - - sal_uInt32 nNewIndex = nIndex; - - NfIndexTableOffset eOffset = pFormatter->GetIndexTableOffset( nIndex ); - if ( eOffset == NF_DATE_SYSTEM_SHORT ) - { - const International& rInt = pData->GetInternational( nFormatLang ); - if ( rInt.IsDateDayLeadingZero() && rInt.IsDateMonthLeadingZero() ) - { - if ( rInt.IsDateCentury() ) - nNewIndex = pFormatter->GetFormatIndex( NF_DATE_SYS_DDMMYYYY, nFormatLang ); - else - nNewIndex = pFormatter->GetFormatIndex( NF_DATE_SYS_DDMMYY, nFormatLang ); - } - } - else if ( eOffset == NF_DATE_SYSTEM_LONG ) - { - const International& rInt = pData->GetInternational( nFormatLang ); - if ( !rInt.IsLongDateDayLeadingZero() ) - { - sal_Bool bCentury = rInt.IsLongDateCentury(); - MonthFormat eMonth = rInt.GetLongDateMonthFormat(); - if ( eMonth == MONTH_LONG && bCentury ) - { - if ( rInt.GetLongDateDayOfWeekFormat() == DAYOFWEEK_LONG ) - nNewIndex = pFormatter->GetFormatIndex( NF_DATE_SYS_NNNNDMMMMYYYY, nFormatLang ); - else - nNewIndex = pFormatter->GetFormatIndex( NF_DATE_SYS_NNDMMMMYYYY, nFormatLang ); - } - else if ( eMonth == MONTH_SHORT && !bCentury ) - nNewIndex = pFormatter->GetFormatIndex( NF_DATE_SYS_NNDMMMYY, nFormatLang ); - } - } - - if ( nNewIndex != nIndex ) - { - // verify the fixed format really matches the format string - // (not the case with some formats from locale data) - - const SvNumberformat* pFixedFormat = pFormatter->GetEntry( nNewIndex ); - if ( pFixedFormat && pFixedFormat->GetFormatstring() == String(sFormat) ) - nIndex = nNewIndex; - } - } -#endif - if ( nIndex != NUMBERFORMAT_ENTRY_NOT_FOUND && !bAutoOrder ) { // use fixed-order formats instead of SYS... if bAutoOrder is false @@ -1843,17 +1771,6 @@ sal_Int32 SvXMLNumFormatContext::CreateAndInsert(SvNumberFormatter* pFormatter) if (!bRemoveAfterUse) GetImport().AddNumberStyle( nKey, GetName() ); -#if 0 - ByteString aByte( String(sFormatName), gsl_getSystemTextEncoding() ); - aByte.Append( " | " ); - aByte.Append(ByteString( String(sFormat), gsl_getSystemTextEncoding() )); - aByte.Append( " | " ); - aByte.Append(ByteString::CreateFromInt32( nIndex )); - -// DBG_ERROR(aByte.GetBuffer()); - int xxx=42; -#endif - return nKey; } |