[Libreoffice-commits] .: basic/source sfx2/inc sfx2/source svx/source xmloff/source
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Sun Feb 13 13:50:31 PST 2011
basic/source/uno/namecont.cxx | 2
basic/source/uno/scriptcont.cxx | 5 -
sfx2/inc/sfx2/docfile.hxx | 2
sfx2/source/appl/appopen.cxx | 2
sfx2/source/dialog/filedlghelper.cxx | 12 ---
sfx2/source/doc/docfile.cxx | 1
sfx2/source/doc/objembed.cxx | 49 ---------------
sfx2/source/doc/objserv.cxx | 1
sfx2/source/doc/sfxbasemodel.cxx | 14 ----
sfx2/source/inc/preview.hxx | 1
sfx2/source/view/orgmgr.cxx | 3
sfx2/source/view/viewfrm.cxx | 111 -----------------------------------
svx/source/xml/xmlgrhlp.cxx | 1
xmloff/source/meta/xmlversion.cxx | 28 --------
14 files changed, 232 deletions(-)
New commits:
commit ae0e29250ea69cb38eb19ad89e92497c6a410780
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sun Feb 13 22:49:58 2011 +0100
Remove some dead code
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index fbccd31..3e4e660 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -1399,7 +1399,6 @@ void SfxLibraryContainer::implStoreLibrary( SfxLibrary* pLib,
xProps->setPropertyValue( aPropName, uno::makeAny( aMime ) );
// #87671 Allow encryption
-//REMOVE aPropName = String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM("Encrypted") );
aPropName = String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "UseCommonStoragePasswordEncryption" ) );
xProps->setPropertyValue( aPropName, uno::makeAny( sal_True ) );
@@ -1547,7 +1546,6 @@ void SfxLibraryContainer::implStoreLibraryIndexFile( SfxLibrary* pLib,
xProps->setPropertyValue( aPropName, uno::makeAny( aMime ) );
// #87671 Allow encryption
-//REMOVE aPropName = String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM("Encrypted") );
aPropName = String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "UseCommonStoragePasswordEncryption" ) );
xProps->setPropertyValue( aPropName, uno::makeAny( sal_True ) );
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index 141e7dd..53f7c76 100644
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -1151,11 +1151,6 @@ sal_Bool SfxScriptLibraryContainer::implLoadPasswordLibrary
}
}
-//REMOVE // If the password is verified the library must remain modified, because
-//REMOVE // otherwise for saving the storage would be copied and that doesn't work
-//REMOVE // with mtg's storages when the password is verified
-//REMOVE if( !pLib->mbPasswordVerified )
-//REMOVE pLib->mbModified = sal_False;
return bRet;
}
diff --git a/sfx2/inc/sfx2/docfile.hxx b/sfx2/inc/sfx2/docfile.hxx
index 226aef8..e1a1057 100644
--- a/sfx2/inc/sfx2/docfile.hxx
+++ b/sfx2/inc/sfx2/docfile.hxx
@@ -97,7 +97,6 @@ class SFX2_DLLPUBLIC SfxMedium : public SvRefBase
SvGlobalName aFilterClass;
SvStream* pInStream;
SvStream* pOutStream;
-//REMOVE SvStorageRef aStorage;
const SfxFilter* pFilter;
SfxItemSet* pSet;
SfxMedium_Impl* pImp;
@@ -283,7 +282,6 @@ public:
SAL_DLLPRIVATE void SetUpdatePickList(sal_Bool);
SAL_DLLPRIVATE sal_Bool IsUpdatePickList() const;
-//REMOVE void SetStorage_Impl( SvStorage* pStor );
SAL_DLLPRIVATE void SetLongName(const String &rName)
{ aLongName = rName; }
SAL_DLLPRIVATE const String & GetLongName() const { return aLongName; }
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index 87e6703..7aae92f 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -464,8 +464,6 @@ ULONG SfxApplication::LoadTemplate( SfxObjectShellLock& xDoc, const String &rFil
xDoc->GetStorage()->copyToStorage( xTempStorage );
-//REMOVE // the following operations should be done in one step
-//REMOVE xDoc->DoHandsOff();
if ( !xDoc->DoSaveCompleted( new SfxMedium( xTempStorage, String() ) ) )
throw uno::RuntimeException();
}
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index 416f9ce..22f253e 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -659,18 +659,6 @@ void FileDialogHelper_Impl::updateVersions()
for ( sal_Int32 i=0; i<xVersions.getLength(); i++ )
aEntries[ i + 1 ] = xVersions[i].Identifier;
-
- // TODO/LATER: not sure that this information must be shown in future ( binfilter? )
-//REMOVE else
-//REMOVE {
-//REMOVE SfxFilterFlags nMust = SFX_FILTER_IMPORT | SFX_FILTER_OWN;
-//REMOVE SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED | SFX_FILTER_STARONEFILTER;
-//REMOVE if ( SFX_APP()->GetFilterMatcher().GetFilter4ClipBoardId( pStor->GetFormat(), nMust, nDont ) )
-//REMOVE {
-//REMOVE aEntries.realloc( 1 );
-//REMOVE aEntries[0] = OUString( String ( SfxResId( STR_SFX_FILEDLG_ACTUALVERSION ) ) );
-//REMOVE }
-//REMOVE }
}
catch( uno::Exception& )
{
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 3848ac7..a14a84e 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -2179,7 +2179,6 @@ void SfxMedium::ClearBackup_Impl()
if ( pImp->m_aBackupURL.getLength() )
{
if ( ::utl::UCBContentHelper::Kill( pImp->m_aBackupURL ) )
- // || !::utl::UCBContentHelper::IsDocument( pImp->m_aBackupURL ) );
{
pImp->m_bRemoveBackup = sal_False;
pImp->m_aBackupURL = ::rtl::OUString();
diff --git a/sfx2/source/doc/objembed.cxx b/sfx2/source/doc/objembed.cxx
index 89a223b..6ca5bcc 100644
--- a/sfx2/source/doc/objembed.cxx
+++ b/sfx2/source/doc/objembed.cxx
@@ -135,45 +135,6 @@ void SfxObjectShell::SetVisArea( const Rectangle & rVisArea )
SetModified( TRUE );
SFX_APP()->NotifyEvent(SfxEventHint( SFX_EVENT_VISAREACHANGED, GlobalEventConfig::GetEventName(STR_EVENT_VISAREACHANGED), this));
-
- /*
- Size aSize (GetVisArea().GetSize());
- if ( GetIPEnv() && GetIPEnv()->GetEditWin() )
- ViewChanged( ASPECT_CONTENT );
- */
-
-
- // OutPlace die Gr"o\se des MDI-Fensters anpassen
- // Unbedingt den Gr"o\senvergleich machen, spart nicht nur Zeit, sondern
- // vermeidet auch Rundungsfehler !
- /*
- // in case of ole outplace editing the frame should be found
- SfxViewFrame* pFrameToResize = pFrame ? pFrame : SfxViewFrame::GetFirst( GetObjectShell() );
-
- if ( pFrameToResize && !pIPF && rRect.GetSize() != aSize &&
- !pFrameToResize->IsAdjustPosSizePixelLocked_Impl() )
-
- {
- // Zuerst die logischen Koordinaten von IP-Objekt und EditWindow
- // ber"ucksichtigen
- SfxViewShell *pShell = pFrameToResize->GetViewShell();
- Window *pWindow = pShell->GetWindow();
-
- // Da in den Applikationen bei der R"ucktransformation immer die
- // Eckpunkte tranformiert werden und nicht die Size (um die Ecken
- // alignen zu k"onnen), transformieren wir hier auch die Punkte, um
- // m"oglichst wenig Rundungsfehler zu erhalten.
- Rectangle aRect = pWindow->LogicToPixel( rRect );
- Size aSize = aRect.GetSize();
- pShell->GetWindow()->SetSizePixel( aSize );
- pFrameToResize->DoAdjustPosSizePixel( pShell, Point(), aSize );
- }
-
- // bei InPlace die View skalieren
- if ( GetIPEnv() && GetIPEnv()->GetEditWin() && !bDisableViewScaling && pIPF )
- pIPF->GetEnv_Impl()->MakeScale( rRect.GetSize(), GetMapUnit(),
- pIPF->GetViewShell()->GetWindow()->GetOutputSizePixel() );
- */
}
}
}
@@ -233,9 +194,6 @@ void SfxObjectShell::DoDraw( OutputDevice* pDev,
Fraction aXF( rSize.Width(), aSize.Width() );
Fraction aYF( rSize.Height(), aSize.Height() );
-//REMOVE Point aOrg = rObjPos;
-//REMOVE aMod.SetMapUnit( MAP_100TH_MM );
-//REMOVE aSize = pDev->LogicToLogic( GetVisArea( nAspect ).GetSize(), &aMod, &aWilliMode );
DoDraw_Impl( pDev, rObjPos, aXF, aYF, rSetup, nAspect );
}
}
@@ -281,9 +239,7 @@ void SfxObjectShell::DoDraw_Impl( OutputDevice* pDev,
else
pMtf = NULL;
}
-// #ifndef UNX
if( pDev->IsClipRegion() && pDev->GetOutDevType() != OUTDEV_PRINTER )
-// #endif
{
aRegion = pDev->PixelToLogic( aRegion );
pDev->SetClipRegion( aRegion );
@@ -291,12 +247,7 @@ void SfxObjectShell::DoDraw_Impl( OutputDevice* pDev,
if( pMtf )
pMtf->Record( pDev );
-//REMOVE SvOutPlaceObjectRef xOutRef( this );
-//REMOVE if ( xOutRef.Is() )
-//REMOVE xOutRef->DrawObject( pDev, rSetup, rSize, nAspect );
-//REMOVE else
Draw( pDev, rSetup, nAspect );
-//REMOVE DrawHatch( pDev, aVisArea.TopLeft(), aVisArea.GetSize() );
// Deviceeinstellungen wieder herstellen
pDev->Pop();
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index c7c98ff..7f75714 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -938,7 +938,6 @@ void SfxObjectShell::GetState_Impl(SfxItemSet &rSet)
if ( !pFrame || !pDoc->HasName() ||
!IsOwnStorageFormat_Impl( *pDoc->GetMedium() ) )
-//REMOVE || pDoc->GetMedium()->GetStorage()->GetVersion() < SOFFICE_FILEFORMAT_50 )
rSet.DisableItem( nWhich );
break;
}
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 2ed1222..f787d40 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -2536,14 +2536,6 @@ void SfxBaseModel::Notify( SfxBroadcaster& rBC ,
{
postEvent_Impl( GlobalEventConfig::GetEventName( STR_EVENT_MODECHANGED ) );
}
-/*
- else if ( pSimpleHint->GetId() == SFX_HINT_DYING
- || pSimpleHint->GetId() == SFX_HINT_DEINITIALIZING )
- {
- SfxObjectShellLock pShellLock = m_pData->m_pObjectShellLock;
- m_pData->m_pObjectShellLock = SfxObjectShellLock();
- }
-*/
}
}
}
@@ -2649,8 +2641,6 @@ void SfxBaseModel::impl_store( const ::rtl::OUString& sURL
if( !sURL.getLength() )
throw frame::IllegalArgumentIOException();
- //sal_Bool aSaveAsTemplate = sal_False;
-
sal_Bool bSaved = sal_False;
if ( !bSaveTo && m_pData->m_pObjectShell && sURL.getLength()
&& sURL.compareToAscii( "private:stream", 14 ) != COMPARE_EQUAL
@@ -3005,8 +2995,6 @@ void SAL_CALL SfxBaseModel::addPrintJobListener( const uno::Reference< view::XPr
if ( xPJB.is() )
xPJB->addPrintJobListener( xListener );
}
-// else
-// m_pData->m_aInterfaceContainer.addInterface( ::getCppuType((const uno::Reference< view::XPrintJobListener >*)0), xListener );
}
void SAL_CALL SfxBaseModel::removePrintJobListener( const uno::Reference< view::XPrintJobListener >& xListener ) throw (uno::RuntimeException)
@@ -3019,8 +3007,6 @@ void SAL_CALL SfxBaseModel::removePrintJobListener( const uno::Reference< view::
if ( xPJB.is() )
xPJB->removePrintJobListener( xListener );
}
-// else
-// m_pData->m_aInterfaceContainer.addInterface( ::getCppuType((const uno::Reference< view::XPrintJobListener >*)0), xListener );
}
// simple declaration of class SvObject is enough
diff --git a/sfx2/source/inc/preview.hxx b/sfx2/source/inc/preview.hxx
index 0d5d84e..e6feb4e 100644
--- a/sfx2/source/inc/preview.hxx
+++ b/sfx2/source/inc/preview.hxx
@@ -33,7 +33,6 @@
#include <sfx2/basedlgs.hxx>
class SfxObjectShell;
-//REMOVE class SvStorageRef;
class SfxFrameWindow;
class SfxFrame;
diff --git a/sfx2/source/view/orgmgr.cxx b/sfx2/source/view/orgmgr.cxx
index 0393239..ac26dd0 100644
--- a/sfx2/source/view/orgmgr.cxx
+++ b/sfx2/source/view/orgmgr.cxx
@@ -70,9 +70,6 @@ struct _FileListEntry
const CollatorWrapper* pCollator;
SfxObjectShellLock aDocShell; // ObjectShell als Ref-Klasse
-//REMOVE SvStorageRef aStor; // Referenz auf Storage, wenn wir diesen geoeffnet haben
- //uno::Reference< embed::XStorage > xStorage;
-
BOOL bFile; // als Datei auf Platte
// (!= unbenannt1, nicht als Dok. geladen;
// diese werden nicht gespeichert!)
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 93a951d..c35e150 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -170,8 +170,6 @@ SFX_IMPL_INTERFACE(SfxViewFrame,SfxShell,SfxResId(0))
TYPEINIT2(SfxViewFrame,SfxShell,SfxListener);
TYPEINIT1(SfxViewFrameItem, SfxPoolItem);
-//=========================================================================
-
//-------------------------------------------------------------------------
namespace
{
@@ -1187,22 +1185,6 @@ void SfxViewFrame::DoActivate( sal_Bool bUI, SfxViewFrame* pOldFrame )
// ViewFrames, erh"alt er ein ParentActivate
if ( bUI )
{
-/*
- SfxMedium* pMed = GetObjectShell() ? GetObjectShell()->GetMedium() : NULL;
- if( pMed )
- {
- SFX_ITEMSET_ARG(
- pMed->GetItemSet(), pInterceptorItem, SfxSlotInterceptorItem,
- SID_INTERCEPTOR, sal_False );
- if( pInterceptorItem )
- {
- SfxSlotInterceptor* pInter = pInterceptorItem->GetValue();
- if( !pInter->GetBindings() )
- pInter->SetBindings( &GetBindings() );
- pInter->Activate( sal_True );
- }
- }
- */
SfxViewFrame *pFrame = GetParentViewFrame();
while ( pFrame )
{
@@ -1224,19 +1206,6 @@ void SfxViewFrame::DoDeactivate(sal_Bool bUI, SfxViewFrame* pNewFrame )
// ViewFrames, erh"alt er ein ParentDeactivate
if ( bUI )
{
-// if ( GetFrame().GetWorkWindow_Impl() )
-// GetFrame().GetWorkWindow_Impl()->SaveStatus_Impl();
-/*
- SfxMedium* pMed = GetObjectShell() ? GetObjectShell()->GetMedium() : NULL;
- if( pMed )
- {
- SFX_ITEMSET_ARG(
- pMed->GetItemSet(), pInterceptorItem, SfxSlotInterceptorItem,
- SID_INTERCEPTOR, sal_False );
- if( pInterceptorItem )
- pInterceptorItem->GetValue()->Activate( sal_False );
- }
-*/
SfxViewFrame *pFrame = GetParentViewFrame();
while ( pFrame )
{
@@ -1259,13 +1228,6 @@ void SfxViewFrame::InvalidateBorderImpl( const SfxViewShell* pSh )
{
if ( GetFrame().IsInPlace() )
{
- /*
- Size aSize( GetViewShell()->GetWindow()->GetSizePixel() );
-
- //Size aBorderSz( pEnv->GetBorderWin()->GetHatchBorderPixel() );
- Point aOfs; //( aBorderSz.Width(), aBorderSz.Height() );
-
- DoAdjustPosSizePixel( GetViewShell(), aOfs, aSize );*/
return;
}
@@ -1699,43 +1661,18 @@ SfxProgress* SfxViewFrame::GetProgress() const
//--------------------------------------------------------------------
void SfxViewFrame::ShowStatusText( const String& /*rText*/)
{
-/* OBSOLETE: If this is used, framework/uielement/progressbarwrapper.[h|c]xx &
- framework/uielement/statusindicatorinterfacewrapper.[h|c]xx must be
- extended to support a new interface to support ShowStatusText/HideStatusText
- SfxWorkWindow* pWorkWin = GetFrame().GetWorkWindow_Impl();
- SfxStatusBarManager *pMgr = pWorkWin->GetStatusBarManager_Impl();
- if ( pMgr )
- {
- pMgr->GetStatusBar()->HideItems();
- pMgr->GetStatusBar()->SetText( rText );
- }
-*/
}
//--------------------------------------------------------------------
void SfxViewFrame::HideStatusText()
{
-/* OBSOLETE: If this is used, framework/uielement/progressbarwrapper.[h|c]xx &
- framework/uielement/statusindicatorinterfacewrapper.[h|c]xx must be
- extended to support a new interface to support ShowStatusText/HideStatusText
- SfxWorkWindow* pWorkWin = GetFrame().GetWorkWindow_Impl();
- SfxStatusBarManager *pMgr = pWorkWin->GetStatusBarManager_Impl();
- if ( pMgr )
- pMgr->GetStatusBar()->ShowItems();
-*/
}
-
//--------------------------------------------------------------------
#ifdef ENABLE_INIMANAGER//MUSTINI
SfxIniManager* SfxViewFrame::GetIniManager() const
{
-/* SfxIniManager *pIniMgr = GetObjectShell()
- ? GetObjectShell()->GetFactory().GetIniManager()
- : 0;
- if ( !pIniMgr )*/ //!
return SFX_APP()->GetAppIniManager();
-// return pIniMgr;
}
#endif
@@ -1885,13 +1822,6 @@ void SfxViewFrame::Enable( sal_Bool bEnable )
if ( pViewSh )
pViewSh->ShowCursor(sal_False);
}
-/*
- if ( !bEnable )
- GetBindings().ENTERREGISTRATIONS();
- GetDispatcher()->Lock( !bEnable );
- if ( bEnable )
- GetBindings().LEAVEREGISTRATIONS();
-*/
}
}
@@ -1929,12 +1859,6 @@ void SfxViewFrame::Show()
GetWindow().Show();
GetFrame().GetWindow().Show();
-/* SfxViewFrame* pCurrent = SfxViewFrame::Current();
- if ( GetFrame().GetFrameInterface()->isActive() &&
- pCurrent != this &&
- ( !pCurrent || pCurrent->GetParentViewFrame_Impl() != this ) &&
- !GetActiveChildFrame_Impl() )
- MakeActive_Impl( FALSE );*/
if ( xObjSh.Is() && xObjSh->Get_Impl()->bHiddenLockedByAPI )
{
xObjSh->Get_Impl()->bHiddenLockedByAPI = FALSE;
@@ -2059,21 +1983,6 @@ void SfxViewFrame::SetActiveChildFrame_Impl( SfxViewFrame *pViewFrame )
SfxViewFrame* SfxViewFrame::GetActiveChildFrame_Impl() const
{
SfxViewFrame *pViewFrame = pImp->pActiveChild;
-/*
- if ( !pViewFrame )
- {
- // Wenn es keinen aktiven ChildFrame gibt, irgendeinen nehmen
- for ( sal_uInt16 n=0; n<GetChildFrameCount(); n++ )
- {
- pViewFrame =
- PTR_CAST( SfxViewFrame, GetChildFrame(n)->GetChildFrame(0) );
- if ( pViewFrame )
- break;
- }
- }
-
- pImp->pActiveChild = pViewFrame;
-*/
return pViewFrame;
}
@@ -2832,14 +2741,6 @@ void CutLines( ::rtl::OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines, BO
*/
void SfxViewFrame::AddDispatchMacroToBasic_Impl( const ::rtl::OUString& sMacro )
{
- /*
- // get lib and modul name from dialog
- SfxModule *pMod = GetObjectShell()->GetModule();
- SfxRequest aReq( SID_BASICCHOOSER, SFX_CALLMODE_SYNCHRON, pMod->GetPool() );
- const SfxPoolItem* pRet = pMod->ExecuteSlot( aReq );
- if ( pRet )
- ::rtl::OUString = ((SfxStringItem*)pRet)->GetValue();
- */
if ( !sMacro.getLength() )
return;
@@ -3023,12 +2924,6 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const ::rtl::OUString& sMacro )
{
// add code for "session only" macro
}
-
- /*
- FILE* pFile = fopen( "macro.bas", "a" );
- fprintf( pFile, "%s", ::rtl::OUStringToOString(sBuffer.makeStringAndClear(),RTL_TEXTENCODING_UTF8).getStr() );
- fclose ( pFile );
- */
}
void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq )
@@ -3501,12 +3396,6 @@ SfxWorkWindow* SfxViewFrame::GetWorkWindow_Impl( USHORT /*nId*/ )
return pWork;
}
-/*
-void SfxViewFrame::SetChildWindow(USHORT nId, BOOL bOn)
-{
- SetChildWindow( nId, bOn, TRUE );
-}*/
-
void SfxViewFrame::SetChildWindow(USHORT nId, BOOL bOn, BOOL bSetFocus )
{
SfxWorkWindow* pWork = GetWorkWindow_Impl( nId );
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index c1e87b5..45e280d 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -518,7 +518,6 @@ SvxGraphicHelperStream_Impl SvXMLGraphicHelper::ImplGetGraphicStream( const ::rt
aRet.xStream = aRet.xStorage->openStreamElement( rPictureStreamName, nMode );
if( aRet.xStream.is() && ( GRAPHICHELPER_MODE_WRITE == meCreateMode ) )
{
-//REMOVE ::rtl::OUString aPropName( RTL_CONSTASCII_USTRINGPARAM("Encrypted") );
::rtl::OUString aPropName( RTL_CONSTASCII_USTRINGPARAM("UseCommonStoragePasswordEncryption") );
uno::Reference < beans::XPropertySet > xProps( aRet.xStream, uno::UNO_QUERY );
xProps->setPropertyValue( aPropName, uno::makeAny( sal_True) );
diff --git a/xmloff/source/meta/xmlversion.cxx b/xmloff/source/meta/xmlversion.cxx
index e58a12e..51e87ab 100644
--- a/xmloff/source/meta/xmlversion.cxx
+++ b/xmloff/source/meta/xmlversion.cxx
@@ -55,7 +55,6 @@ using ::rtl::OUString;
sal_Char XMLN_VERSIONSLIST[] = "VersionList.xml";
// ------------------------------------------------------------------------
-
// #110897#
XMLVersionListExport::XMLVersionListExport(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory,
@@ -116,8 +115,6 @@ sal_uInt32 XMLVersionListExport::exportDoc( enum ::xmloff::token::XMLTokenEnum )
}
// ------------------------------------------------------------------------
-// ------------------------------------------------------------------------
-
// #110897#
XMLVersionListImport::XMLVersionListImport(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory,
@@ -156,8 +153,6 @@ SvXMLImportContext *XMLVersionListImport::CreateContext(
// ------------------------------------------------------------------------
-// ------------------------------------------------------------------------
-
XMLVersionListContext::XMLVersionListContext( XMLVersionListImport& rImport,
sal_uInt16 nPrefix,
const OUString& rLocalName,
@@ -192,8 +187,6 @@ SvXMLImportContext *XMLVersionListContext::CreateChildContext( sal_uInt16 nPrefi
}
// ------------------------------------------------------------------------
-// ------------------------------------------------------------------------
-
XMLVersionContext::XMLVersionContext( XMLVersionListImport& rImport,
sal_uInt16 nPref,
const OUString& rLocalName,
@@ -253,7 +246,6 @@ XMLVersionContext::~XMLVersionContext( void )
{}
// ------------------------------------------------------------------------
-// static
sal_Bool XMLVersionContext::ParseISODateTimeString(
const rtl::OUString& rString,
util::DateTime& rDateTime )
@@ -355,8 +347,6 @@ sal_Bool XMLVersionContext::ParseISODateTimeString(
// ------------------------------------------------------------------------
-// ------------------------------------------------------------------------
-
void SAL_CALL XMLVersionListPersistence::store( const uno::Reference< embed::XStorage >& xRoot, const uno::Sequence< util::RevisionTag >& rVersions )
throw (::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException)
{
@@ -376,14 +366,6 @@ void SAL_CALL XMLVersionListPersistence::store( const uno::Reference< embed::XSt
// and delete it
OUString sVerName( RTL_CONSTASCII_USTRINGPARAM( XMLN_VERSIONSLIST ) );
- // is this really needed, we set the size to zero before doing
- // anything with this stream?
-/* if ( xRoot->IsContained( sVerName ) )
- {
- xRoot->Remove( sVerName );
- xRoot->Commit();
- }
-*/
try {
// open (create) the sub storage with the version info
uno::Reference< io::XStream > xVerStream = xRoot->openStreamElement(
@@ -392,11 +374,6 @@ void SAL_CALL XMLVersionListPersistence::store( const uno::Reference< embed::XSt
if ( !xVerStream.is() )
throw uno::RuntimeException();
-//REMOVE // SetSize should not be neccessary because OpenStream( WRITE|TRUNC ) should already
-//REMOVE // have set the size to zero
-//REMOVE // xVerStream->SetSize ( 0L );
-//REMOVE xVerStream->SetBufferSize( 16*1024 );
-
Reference< io::XOutputStream > xOut = xVerStream->getOutputStream();
if ( !xOut.is() )
throw uno::RuntimeException(); // the stream was successfuly opened for writing already
@@ -411,9 +388,7 @@ void SAL_CALL XMLVersionListPersistence::store( const uno::Reference< embed::XSt
aExp.exportDoc( ::xmloff::token::XML_VERSION );
-//REMOVE xVerStream->Commit();
xVerStream = uno::Reference< io::XStream >(); // use refcounting for now to dispose
- // xRoot->Commit();
}
catch( uno::Exception& )
{
@@ -457,9 +432,6 @@ uno::Sequence< util::RevisionTag > SAL_CALL XMLVersionListPersistence::load( con
if ( !xDocStream.is() )
throw uno::RuntimeException();
-//REMOVE xDocStream->Seek( 0L );
-//REMOVE xDocStream->SetBufferSize( 16*1024 );
-
aParserInput.aInputStream = xDocStream->getInputStream();
OSL_ENSURE( aParserInput.aInputStream.is(),
"The stream was successfuly opened for reading, the input part must be accessible!\n" );
More information about the Libreoffice-commits
mailing list