[Libreoffice-commits] .: 3 commits - sfx2/inc sfx2/source svx/source
Caolán McNamara
caolan at kemper.freedesktop.org
Fri Jul 29 02:57:43 PDT 2011
sfx2/inc/guisaveas.hxx | 6 -
sfx2/inc/sfx2/app.hxx | 1
sfx2/inc/sfx2/bindings.hxx | 2
sfx2/inc/sfx2/dinfedt.hxx | 28 -------
sfx2/inc/sfx2/docfac.hxx | 2
sfx2/inc/sfx2/frame.hxx | 1
sfx2/inc/sfx2/mailmodelapi.hxx | 1
sfx2/source/appl/app.cxx | 19 -----
sfx2/source/appl/workwin.cxx | 27 -------
sfx2/source/control/bindings.cxx | 14 ---
sfx2/source/dialog/dinfedt.cxx | 19 -----
sfx2/source/dialog/mailmodel.cxx | 14 ---
sfx2/source/doc/docfac.cxx | 13 ---
sfx2/source/doc/guisaveas.cxx | 10 --
sfx2/source/inc/mailmodel.hxx | 1
sfx2/source/inc/workwin.hxx | 12 ---
sfx2/source/view/frame2.cxx | 24 ------
svx/source/customshapes/EnhancedCustomShape2d.cxx | 9 +-
svx/source/fmcomp/trace.cxx | 81 +++++++++-------------
svx/source/svdraw/svdedtv.cxx | 17 ++--
svx/source/svdraw/svdpage.cxx | 17 ++--
svx/source/svdraw/svdxcgv.cxx | 35 +++++----
svx/source/table/tablertfexporter.cxx | 26 -------
23 files changed, 83 insertions(+), 296 deletions(-)
New commits:
commit 03198f825bd0a776f2f08aa7fb81c3cfa5324a69
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jul 29 10:54:19 2011 +0100
callcatcher: ditch newly unused code
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 32bf16f..9a7fa87 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -2753,22 +2753,6 @@ Rectangle SfxWorkWindow::GetFreeArea( sal_Bool bAutoHide ) const
return aClientArea;
}
-void SfxWorkWindow::DisableChildWindow_Impl( sal_uInt16 nId, sal_Bool bDisable )
-{
- sal_uInt16 nCount = pChildWins->Count();
- sal_uInt16 n;
- for (n=0; n<nCount; n++)
- if ((*pChildWins)[n]->nSaveId == nId)
- break;
- if ( n<nCount && (*pChildWins)[n]->bDisabled != bDisable )
- {
- (*pChildWins)[n]->bDisabled = bDisable;
- UpdateChildWindows_Impl();
- ArrangeChilds_Impl();
- ShowChilds_Impl();
- }
-}
-
void SfxWorkWindow::SetActiveChild_Impl( Window *pChild )
{
pActiveChild = pChild;
diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx
index 80bc1f1..c33861c 100644
--- a/sfx2/source/inc/workwin.hxx
+++ b/sfx2/source/inc/workwin.hxx
@@ -338,7 +338,6 @@ public:
SfxSplitWindow* GetSplitWindow_Impl(SfxChildAlignment);
sal_Bool IsVisible_Impl( sal_uInt16 nMode ) const;
- void DisableChildWindow_Impl( sal_uInt16 nId, sal_Bool bDisable );
sal_Bool IsFloating( sal_uInt16 nId );
void SetActiveChild_Impl( Window *pChild );
virtual sal_Bool ActivateNextChild_Impl( sal_Bool bForward = sal_True );
commit e6d15541d60a778424a9f4e135881bae5978b417
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jul 28 22:47:19 2011 +0100
callcatcher: ditch various unused methods
diff --git a/sfx2/inc/guisaveas.hxx b/sfx2/inc/guisaveas.hxx
index 0b442a3..e456794 100644
--- a/sfx2/inc/guisaveas.hxx
+++ b/sfx2/inc/guisaveas.hxx
@@ -96,12 +96,6 @@ public:
::rtl::OUString aDefUIName,
sal_Bool bCanProceedFurther );
- static void ExecuteFilterDialog( SfxStoringHelper& _rStorageHelper
- ,const ::rtl::OUString& sFilterName
- ,const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel
- ,/*OUT*/::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArgsSequence
- );
-
static Window* GetModelWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel );
};
diff --git a/sfx2/inc/sfx2/app.hxx b/sfx2/inc/sfx2/app.hxx
index 47b6175..3ed4975 100644
--- a/sfx2/inc/sfx2/app.hxx
+++ b/sfx2/inc/sfx2/app.hxx
@@ -143,7 +143,6 @@ class SFX2_DLLPUBLIC SfxApplication: public SfxShell
SfxAppData_Impl* pAppData_Impl;
DECL_DLLPRIVATE_LINK( GlobalBasicErrorHdl_Impl, StarBASIC* );
- SAL_DLLPRIVATE short QuerySave_Impl(SfxObjectShell &, sal_Bool bAutoSave = sal_False);
static SfxApplication* Create();
void Init();
diff --git a/sfx2/inc/sfx2/bindings.hxx b/sfx2/inc/sfx2/bindings.hxx
index 9a40285..2f5cffa 100644
--- a/sfx2/inc/sfx2/bindings.hxx
+++ b/sfx2/inc/sfx2/bindings.hxx
@@ -195,7 +195,6 @@ public:
SAL_DLLPRIVATE void ContextChanged_Impl();
SAL_DLLPRIVATE void Execute_Impl( SfxRequest& rReq, const SfxSlot* pSlot, SfxShell* pShell );
SAL_DLLPRIVATE void DeleteControllers_Impl();
- SAL_DLLPRIVATE SfxPopupAction GetPopupAction_Impl() const;
SAL_DLLPRIVATE SfxDispatcher* GetDispatcher_Impl() { return pDispatcher; }
SAL_DLLPRIVATE void ClearCache_Impl( sal_uInt16 nSlotId );
SAL_DLLPRIVATE sal_Bool IsInUpdate_Impl() const{ return IsInUpdate(); }
@@ -209,7 +208,6 @@ public:
SAL_DLLPRIVATE void ReleaseUnoController_Impl( SfxUnoControllerItem* );
SAL_DLLPRIVATE sal_Bool ExecuteCommand_Impl( const String& rCommand );
SAL_DLLPRIVATE void SetRecorder_Impl( com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder >& );
- SAL_DLLPRIVATE void ExecuteGlobal_Impl( sal_uInt16 nId );
SAL_DLLPRIVATE void InvalidateSlotsInMap_Impl();
SAL_DLLPRIVATE void AddSlotToInvalidateSlotsMap_Impl( sal_uInt16 nId );
};
diff --git a/sfx2/inc/sfx2/dinfedt.hxx b/sfx2/inc/sfx2/dinfedt.hxx
index 8d5827c..1e34ff8 100644
--- a/sfx2/inc/sfx2/dinfedt.hxx
+++ b/sfx2/inc/sfx2/dinfedt.hxx
@@ -46,34 +46,6 @@ public:
virtual void KeyInput( const KeyEvent& rKEvent );
};
-// class SfxDocInfoEditDlg -----------------------------------------------
-
-class SfxDocInfoEditDlg : public ModalDialog
-{
-private:
- FixedLine aInfoFL;
- InfoEdit_Impl aInfo1ED;
- InfoEdit_Impl aInfo2ED;
- InfoEdit_Impl aInfo3ED;
- InfoEdit_Impl aInfo4ED;
- OKButton aOkBT;
- CancelButton aCancelBT;
- HelpButton aHelpBtn;
-
-public:
- SfxDocInfoEditDlg( Window* pParent );
-
- void SetText1( const String &rStr) { aInfo1ED.SetText( rStr ); }
- void SetText2( const String &rStr) { aInfo2ED.SetText( rStr ); }
- void SetText3( const String &rStr) { aInfo3ED.SetText( rStr ); }
- void SetText4( const String &rStr) { aInfo4ED.SetText( rStr ); }
-
- String GetText1() const { return aInfo1ED.GetText(); }
- String GetText2() const { return aInfo2ED.GetText(); }
- String GetText3() const { return aInfo3ED.GetText(); }
- String GetText4() const { return aInfo4ED.GetText(); }
-};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/docfac.hxx b/sfx2/inc/sfx2/docfac.hxx
index fb89ea4..2841927 100644
--- a/sfx2/inc/sfx2/docfac.hxx
+++ b/sfx2/inc/sfx2/docfac.hxx
@@ -86,8 +86,6 @@ public:
String GetFactoryURL() const; // shortcut for "private:factory/GetShortName()"
String GetFactoryName() const { return String::CreateFromAscii( pShortName ); }
String GetModuleName() const;
- void SetDocumentTypeNameResource( const ResId& rId );
- String GetDocumentTypeName() const;
SfxFilterContainer *GetFilterContainer( sal_Bool bForceLoad = sal_True) const;
// Views
diff --git a/sfx2/inc/sfx2/frame.hxx b/sfx2/inc/sfx2/frame.hxx
index c62690b..afe9a7c 100644
--- a/sfx2/inc/sfx2/frame.hxx
+++ b/sfx2/inc/sfx2/frame.hxx
@@ -222,7 +222,6 @@ public:
SAL_DLLPRIVATE void SetMenuBarOn_Impl( sal_Bool bOn );
SAL_DLLPRIVATE sal_Bool IsMenuBarOn_Impl() const;
SAL_DLLPRIVATE SystemWindow* GetTopWindow_Impl() const;
- SAL_DLLPRIVATE void PositionWindow_Impl( const Rectangle& rWinArea ) const;
SAL_DLLPRIVATE bool IsMarkedHidden_Impl() const;
private:
SAL_DLLPRIVATE void Construct_Impl();
diff --git a/sfx2/inc/sfx2/mailmodelapi.hxx b/sfx2/inc/sfx2/mailmodelapi.hxx
index 3e0caa3..47e6798 100644
--- a/sfx2/inc/sfx2/mailmodelapi.hxx
+++ b/sfx2/inc/sfx2/mailmodelapi.hxx
@@ -85,7 +85,6 @@ private:
sal_Bool mbLoadDone;
void ClearList( AddressList_Impl* pList );
- void MakeValueList( AddressList_Impl* pList, String& rValueList );
SaveResult SaveDocumentAsFormat( const rtl::OUString& aSaveFileName,
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xFrameOrModel,
const rtl::OUString& rType,
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index 918e654..9397f08 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -505,25 +505,6 @@ void SfxApplication::SetViewFrame_Impl( SfxViewFrame *pFrame )
pFrame->GetViewShell()->SetCurrentDocument();
}
-//--------------------------------------------------------------------
-
-short SfxApplication::QuerySave_Impl( SfxObjectShell& rDoc, sal_Bool /*bAutoSave*/ )
-{
- if ( !rDoc.IsModified() )
- return RET_NO;
-
- String aMsg( SfxResId( STR_ISMODIFIED ) );
- aMsg.SearchAndReplaceAscii( "%1", rDoc.GetTitle() );
-
- SfxFrame& rFrame = SfxViewFrame::GetFirst(&rDoc)->GetFrame();
- rFrame.Appear();
-
- WinBits nBits = WB_YES_NO_CANCEL | WB_DEF_NO;
- QueryBox aBox( &rFrame.GetWindow(), nBits, aMsg );
-
- return aBox.Execute();
-}
-
//---------------------------------------------------------------------
ResMgr* SfxApplication::CreateResManager( const char *pPrefix )
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 8402a6b..32bf16f 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -2753,17 +2753,6 @@ Rectangle SfxWorkWindow::GetFreeArea( sal_Bool bAutoHide ) const
return aClientArea;
}
-SfxChildWinController_Impl::SfxChildWinController_Impl( sal_uInt16 nID, SfxWorkWindow *pWork )
- : SfxControllerItem( nID, pWork->GetBindings() )
- , pWorkwin( pWork )
-{}
-
-void SfxChildWinController_Impl::StateChanged(
- sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* )
-{
- pWorkwin->DisableChildWindow_Impl( nSID, eState == SFX_ITEM_DISABLED );
-}
-
void SfxWorkWindow::DisableChildWindow_Impl( sal_uInt16 nId, sal_Bool bDisable )
{
sal_uInt16 nCount = pChildWins->Count();
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index 2da6779..db06b53 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -345,14 +345,6 @@ void SfxBindings::DeleteControllers_Impl()
//--------------------------------------------------------------------
-SfxPopupAction SfxBindings::GetPopupAction_Impl() const
-{
- return pImp->ePopupAction;
-}
-
-
-//--------------------------------------------------------------------
-
void SfxBindings::HidePopups( bool bHide )
{
// Hide SfxPopupWindows
@@ -1119,12 +1111,6 @@ sal_Bool SfxBindings::Execute( sal_uInt16 nId, const SfxPoolItem** ppItems, sal_
return ( pRet != 0 );
}
-void SfxBindings::ExecuteGlobal_Impl( sal_uInt16 nId )
-{
- if( nId && pDispatcher )
- Execute_Impl( nId, NULL, 0, SFX_CALLMODE_ASYNCHRON, NULL, sal_True );
-}
-
const SfxPoolItem* SfxBindings::Execute_Impl( sal_uInt16 nId, const SfxPoolItem** ppItems, sal_uInt16 nModi, SfxCallMode nCallMode,
const SfxPoolItem **ppInternalArgs, sal_Bool bGlobalOnly )
{
diff --git a/sfx2/source/dialog/dinfedt.cxx b/sfx2/source/dialog/dinfedt.cxx
index aceeb17..6885fbb 100644
--- a/sfx2/source/dialog/dinfedt.cxx
+++ b/sfx2/source/dialog/dinfedt.cxx
@@ -43,23 +43,4 @@ void InfoEdit_Impl::KeyInput( const KeyEvent& rKEvent )
Edit::KeyInput( rKEvent );
}
-// class SfxDocInfoEditDlg -----------------------------------------------
-
-SfxDocInfoEditDlg::SfxDocInfoEditDlg( Window* pParent ) :
-
- ModalDialog( pParent, SfxResId( DLG_DOCINFO_EDT ) ),
-
- aInfoFL ( this, SfxResId( FL_INFO ) ),
- aInfo1ED ( this, SfxResId( ED_INFO1 ) ),
- aInfo2ED ( this, SfxResId( ED_INFO2 ) ),
- aInfo3ED ( this, SfxResId( ED_INFO3 ) ),
- aInfo4ED ( this, SfxResId( ED_INFO4 ) ),
- aOkBT ( this, SfxResId( BT_OK ) ),
- aCancelBT ( this, SfxResId( BT_CANCEL ) ),
- aHelpBtn ( this, SfxResId( BTN_HELP ) )
-
-{
- FreeResource();
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx
index 819e774..9730933 100644
--- a/sfx2/source/dialog/mailmodel.cxx
+++ b/sfx2/source/dialog/mailmodel.cxx
@@ -160,20 +160,6 @@ void SfxMailModel::ClearList( AddressList_Impl* pList )
}
}
-void SfxMailModel::MakeValueList( AddressList_Impl* pList, String& rValueList )
-{
- rValueList.Erase();
- if ( pList )
- {
- for( size_t i = 0, n = pList->size(); i < n; ++i )
- {
- if ( rValueList.Len() > 0 )
- rValueList += ',';
- rValueList += *pList->at(i);
- }
- }
-}
-
sal_Bool HasDocumentValidSignature( const css::uno::Reference< css::frame::XModel >& xModel )
{
try
diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx
index f9ce9ef..a82c4ee 100644
--- a/sfx2/source/doc/docfac.cxx
+++ b/sfx2/source/doc/docfac.cxx
@@ -372,19 +372,6 @@ const SfxFilter* SfxObjectFactory::GetTemplateFilter() const
return pFilter;
}
-void SfxObjectFactory::SetDocumentTypeNameResource( const ResId& rId )
-{
- DBG_ASSERT( !pImpl->pNameResId, "UI-Name resource set multiple times!" );
- pImpl->pNameResId = new ResId( rId );
-}
-
-String SfxObjectFactory::GetDocumentTypeName() const
-{
- if ( pImpl->pNameResId )
- return String( *pImpl->pNameResId );
- return String();
-}
-
void SfxObjectFactory::SetDocumentServiceName( const ::rtl::OUString& rServiceName )
{
pImpl->aServiceName = rServiceName;
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index 783d623..3583da8 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -1761,16 +1761,6 @@ sal_Bool SfxStoringHelper::WarnUnacceptableFormat( const uno::Reference< frame::
return aDlg.Execute() == RET_OK;
}
-void SfxStoringHelper::ExecuteFilterDialog( SfxStoringHelper& _rStorageHelper
- ,const ::rtl::OUString& _sFilterName
- ,const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& _xModel
- ,/*OUT*/::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rArgsSequence)
-{
- ModelData_Impl aModelData( _rStorageHelper, _xModel, _rArgsSequence );
- if ( aModelData.ExecuteFilterDialog_Impl( _sFilterName ) )
- _rArgsSequence = aModelData.GetMediaDescr().getAsConstPropertyValueList();
-}
-
Window* SfxStoringHelper::GetModelWindow( const uno::Reference< frame::XModel >& xModel )
{
Window* pWin = 0;
diff --git a/sfx2/source/inc/mailmodel.hxx b/sfx2/source/inc/mailmodel.hxx
index a7536bc..e8a6c14 100644
--- a/sfx2/source/inc/mailmodel.hxx
+++ b/sfx2/source/inc/mailmodel.hxx
@@ -77,7 +77,6 @@ private:
sal_Bool mbLoadDone;
void ClearList( AddressList_Impl* pList );
- void MakeValueList( AddressList_Impl* pList, String& rValueList );
SaveResult SaveDocumentAsFormat( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, const rtl::OUString& rType, rtl::OUString& rFileNamePath );
DECL_LINK( DoneHdl, void* );
diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx
index 084385a..80bc1f1 100644
--- a/sfx2/source/inc/workwin.hxx
+++ b/sfx2/source/inc/workwin.hxx
@@ -120,17 +120,6 @@ struct SfxChild_Impl
}
};
-//--------------------------------------------------------------------
-class SfxChildWinController_Impl : public SfxControllerItem
-{
- SfxWorkWindow* pWorkwin;
-
- public:
- SfxChildWinController_Impl( sal_uInt16 nId, SfxWorkWindow *pWin );
- virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
- const SfxPoolItem* pState );
-};
-
struct SfxChildWin_Impl
{
sal_uInt16 nSaveId; // the ChildWindow-Id
diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx
index 0b1f2f5..7fea0cf 100644
--- a/sfx2/source/view/frame2.cxx
+++ b/sfx2/source/view/frame2.cxx
@@ -433,30 +433,6 @@ sal_Bool SfxFrame::IsMenuBarOn_Impl() const
return pImp->bMenuBarOn;
}
-void SfxFrame::PositionWindow_Impl( const Rectangle& rWinArea ) const
-{
- Window *pWin = pImp->pExternalContainerWindow;
-
- const Size aAppWindow( pImp->pExternalContainerWindow->GetDesktopRectPixel().GetSize() );
- Point aPos( rWinArea.TopLeft() );
- Size aSz( rWinArea.GetSize() );
- if ( aSz.Width() && aSz.Height() )
- {
- aPos.X() = Min(aPos.X(),
- long(aAppWindow.Width() - aSz.Width() + aSz.Width() / 2) );
- aPos.Y() = Min(aPos.Y(),
- long( aAppWindow.Height() - aSz.Height() + aSz.Height() / 2) );
- if ( aPos.X() + aSz.Width() <
- aAppWindow.Width() + aSz.Width() / 2 &&
- aPos.Y() + aSz.Height() <
- aAppWindow.Height() + aSz.Height() / 2 )
- {
- pWin->SetPosPixel( aPos );
- pWin->SetOutputSizePixel( aSz );
- }
- }
-}
-
void SfxFrame::PrepareForDoc_Impl( SfxObjectShell& i_rDoc )
{
const ::comphelper::NamedValueCollection aDocumentArgs( i_rDoc.GetModel()->getArgs() );
commit ed43eb0264d2690d0b7128513682854765ec8238
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jul 28 21:30:34 2011 +0100
ByteString::CreateFromInt32->rtl::OString[Buffer]
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index 37350c7..d04bd8c 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -66,7 +66,7 @@
// #i76201#
#include <basegfx/polygon/b2dpolygontools.hxx>
-
+#include <rtl/strbuf.hxx>
#include <math.h>
using namespace ::com::sun::star::uno;
@@ -1711,9 +1711,10 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegm
case UNKNOWN :
default :
{
- ByteString aString( "CustomShapes::unknown PolyFlagValue :" );
- aString.Append( ByteString::CreateFromInt32( nCommand ) );
- OSL_FAIL( aString.GetBuffer() );
+ rtl::OStringBuffer aString(RTL_CONSTASCII_STRINGPARAM(
+ "CustomShapes::unknown PolyFlagValue :"));
+ aString.append(static_cast<sal_Int32>(nCommand));
+ OSL_FAIL(aString.getStr());
}
break;
#endif
diff --git a/svx/source/fmcomp/trace.cxx b/svx/source/fmcomp/trace.cxx
index 548650c..53c4eac 100644
--- a/svx/source/fmcomp/trace.cxx
+++ b/svx/source/fmcomp/trace.cxx
@@ -30,6 +30,7 @@
#include "precompiled_svx.hxx"
#include "trace.hxx"
#include <tools/debug.hxx>
+#include <rtl/strbuf.hxx>
#if defined(DBG_UTIL)
@@ -47,18 +48,15 @@ Tracer::Tracer(const char* _pBlockDescription)
::osl::MutexGuard aGuard(s_aMapSafety);
sal_uInt32 nIndent = s_aThreadIndents[ ::osl::Thread::getCurrentIdentifier() ]++;
- ByteString sIndent;
+ rtl::OStringBuffer sMessage;
+ sMessage.append(static_cast<sal_Int32>(
+ ::osl::Thread::getCurrentIdentifier()));
+ sMessage.append('\t');
while (nIndent--)
- sIndent += '\t';
-
- ByteString sThread( ByteString::CreateFromInt32( (sal_Int32)::osl::Thread::getCurrentIdentifier() ) );
- sThread += '\t';
-
- ByteString sMessage(sThread);
- sMessage += sIndent;
- sMessage += m_sBlockDescription;
- sMessage += " {";
- OSL_TRACE(sMessage.GetBuffer());
+ sMessage.append('\t');
+ sMessage.append(m_sBlockDescription);
+ sMessage.append(RTL_CONSTASCII_STRINGPARAM(" {"));
+ OSL_TRACE(sMessage.getStr());
}
//------------------------------------------------------------------------------
@@ -67,18 +65,15 @@ Tracer::~Tracer()
::osl::MutexGuard aGuard(s_aMapSafety);
sal_Int32 nIndent = --s_aThreadIndents[ ::osl::Thread::getCurrentIdentifier() ];
- ByteString sIndent;
+ rtl::OStringBuffer sMessage;
+ sMessage.append(static_cast<sal_Int32>(
+ ::osl::Thread::getCurrentIdentifier()));
+ sMessage.append('\t');
while (nIndent--)
- sIndent += '\t';
-
- ByteString sThread( ByteString::CreateFromInt32( (sal_Int32)::osl::Thread::getCurrentIdentifier() ) );
- sThread += '\t';
-
- ByteString sMessage(sThread);
- sMessage += sIndent;
- sMessage += "} // ";
- sMessage += m_sBlockDescription;
- OSL_TRACE(sMessage.GetBuffer());
+ sMessage.append('\t');
+ sMessage.append(RTL_CONSTASCII_STRINGPARAM("} // "));
+ sMessage.append(m_sBlockDescription);
+ OSL_TRACE(sMessage.getStr());
}
//------------------------------------------------------------------------------
@@ -87,19 +82,16 @@ void Tracer::TraceString(const char* _pMessage)
::osl::MutexGuard aGuard(s_aMapSafety);
sal_Int32 nIndent = s_aThreadIndents[ ::osl::Thread::getCurrentIdentifier() ];
- ByteString sIndent;
+ rtl::OStringBuffer sMessage;
+ sMessage.append(static_cast<sal_Int32>(
+ ::osl::Thread::getCurrentIdentifier()));
+ sMessage.append('\t');
while (nIndent--)
- sIndent += '\t';
-
- ByteString sThread( ByteString::CreateFromInt32( (sal_Int32)::osl::Thread::getCurrentIdentifier() ) );
- sThread += '\t';
-
- ByteString sMessage(sThread);
- sMessage += sIndent;
- sMessage += m_sBlockDescription;
- sMessage += ": ";
- sMessage += _pMessage;
- OSL_TRACE(sMessage.GetBuffer());
+ sMessage.append('\t');
+ sMessage.append(m_sBlockDescription);
+ sMessage.append(RTL_CONSTASCII_STRINGPARAM(": "));
+ sMessage.append(_pMessage);
+ OSL_TRACE(sMessage.getStr());
}
//------------------------------------------------------------------------------
@@ -108,19 +100,16 @@ void Tracer::TraceString1StringParam(const char* _pMessage, const char* _pParam)
::osl::MutexGuard aGuard(s_aMapSafety);
sal_Int32 nIndent = s_aThreadIndents[ ::osl::Thread::getCurrentIdentifier() ];
- ByteString sIndent;
+ rtl::OStringBuffer sMessage;
+ sMessage.append(static_cast<sal_Int32>(
+ ::osl::Thread::getCurrentIdentifier()));
+ sMessage.append('\t');
while (nIndent--)
- sIndent += '\t';
-
- ByteString sThread( ByteString::CreateFromInt32( (sal_Int32)::osl::Thread::getCurrentIdentifier() ) );
- sThread += '\t';
-
- ByteString sMessage(sThread);
- sMessage += sIndent;
- sMessage += m_sBlockDescription;
- sMessage += ": ";
- sMessage += _pMessage;
- OSL_TRACE(sMessage.GetBuffer(), _pParam);
+ sMessage.append('\t');
+ sMessage.append(m_sBlockDescription);
+ sMessage.append(RTL_CONSTASCII_STRINGPARAM(": "));
+ sMessage.append(_pMessage);
+ OSL_TRACE(sMessage.getStr(), _pParam);
}
#endif
diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx
index 97b4a26..93e3075 100644
--- a/svx/source/svdraw/svdedtv.cxx
+++ b/svx/source/svdraw/svdedtv.cxx
@@ -44,6 +44,7 @@
#include "svx/svdstr.hrc" // Namen aus der Resource
#include "svx/svdglob.hxx" // StringCache
#include <svx/e3dsceneupdater.hxx>
+#include <rtl/strbuf.hxx>
// #i13033#
#include <clonelist.hxx>
@@ -976,21 +977,23 @@ void SdrEditView::CopyMarkedObj()
if(0L != nCloneErrCnt)
{
#ifdef DBG_UTIL
- ByteString aStr("SdrEditView::CopyMarkedObj(): Fehler beim Clonen ");
+ rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
+ "SdrEditView::CopyMarkedObj(): Fehler beim Clonen "));
if(nCloneErrCnt == 1)
{
- aStr += "eines Zeichenobjekts.";
+ aStr.append(RTL_CONSTASCII_STRINGPARAM("eines Zeichenobjekts."));
}
else
{
- aStr += "von ";
- aStr += ByteString::CreateFromInt32( nCloneErrCnt );
- aStr += " Zeichenobjekten.";
+ aStr.append(RTL_CONSTASCII_STRINGPARAM("von "));
+ aStr.append(static_cast<sal_Int32>(nCloneErrCnt));
+ aStr.append(RTL_CONSTASCII_STRINGPARAM(" Zeichenobjekten."));
}
- aStr += " Objektverbindungen werden nicht mitkopiert.";
- OSL_FAIL(aStr.GetBuffer());
+ aStr.append(RTL_CONSTASCII_STRINGPARAM(
+ " Objektverbindungen werden nicht mitkopiert."));
+ OSL_FAIL(aStr.getStr());
#endif
}
MarkListHasChanged();
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index 4a2209b..ecd2400 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -68,6 +68,7 @@
#include <svx/sdr/contact/displayinfo.hxx>
#include <algorithm>
#include <svl/smplhint.hxx>
+#include <rtl/strbuf.hxx>
using namespace ::com::sun::star;
@@ -208,22 +209,24 @@ void SdrObjList::CopyObjects(const SdrObjList& rSrcList)
}
} else {
#ifdef DBG_UTIL
- ByteString aStr("SdrObjList::operator=(): Fehler beim Clonen ");
+ rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
+ "SdrObjList::operator=(): Fehler beim Clonen "));
if(nCloneErrCnt == 1)
{
- aStr += "eines Zeichenobjekts.";
+ aStr.append(RTL_CONSTASCII_STRINGPARAM("eines Zeichenobjekts."));
}
else
{
- aStr += "von ";
- aStr += ByteString::CreateFromInt32( nCloneErrCnt );
- aStr += " Zeichenobjekten.";
+ aStr.append(RTL_CONSTASCII_STRINGPARAM("von "));
+ aStr.append(static_cast<sal_Int32>(nCloneErrCnt));
+ aStr.append(RTL_CONSTASCII_STRINGPARAM(" Zeichenobjekten."));
}
- aStr += " Objektverbindungen werden nicht mitkopiert.";
+ aStr.append(RTL_CONSTASCII_STRINGPARAM(
+ " Objektverbindungen werden nicht mitkopiert."));
- OSL_FAIL(aStr.GetBuffer());
+ OSL_FAIL(aStr.getStr());
#endif
}
}
diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx
index b9718ca..f7f7a02 100644
--- a/svx/source/svdraw/svdxcgv.cxx
+++ b/svx/source/svdraw/svdxcgv.cxx
@@ -63,6 +63,7 @@
// #i72535#
#include "fmobj.hxx"
+#include <rtl/strbuf.hxx>
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -445,22 +446,25 @@ sal_Bool SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjL
if(0L != nCloneErrCnt)
{
#ifdef DBG_UTIL
- ByteString aStr("SdrExchangeView::Paste(): Fehler beim Clonen ");
+ rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
+ "SdrExchangeView::Paste(): Fehler beim Clonen "));
if(nCloneErrCnt == 1)
{
- aStr += "eines Zeichenobjekts.";
+ aStr.append(RTL_CONSTASCII_STRINGPARAM(
+ "eines Zeichenobjekts."));
}
else
{
- aStr += "von ";
- aStr += ByteString::CreateFromInt32( nCloneErrCnt );
- aStr += " Zeichenobjekten.";
+ aStr.append(RTL_CONSTASCII_STRINGPARAM("von "));
+ aStr.append(static_cast<sal_Int32>(nCloneErrCnt));
+ aStr.append(RTL_CONSTASCII_STRINGPARAM(" Zeichenobjekten."));
}
- aStr += " Objektverbindungen werden nicht mitkopiert.";
+ aStr.append(RTL_CONSTASCII_STRINGPARAM(
+ " Objektverbindungen werden nicht mitkopiert."));
- OSL_FAIL(aStr.GetBuffer());
+ OSL_FAIL(aStr.getStr());
#endif
}
}
@@ -829,22 +833,25 @@ SdrModel* SdrExchangeView::GetMarkedObjModel() const
if(0L != nCloneErrCnt)
{
#ifdef DBG_UTIL
- ByteString aStr("SdrExchangeView::GetMarkedObjModel(): Fehler beim Clonen ");
+ rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
+ "SdrExchangeView::GetMarkedObjModel(): Fehler beim Clonen "));
if(nCloneErrCnt == 1)
{
- aStr += "eines Zeichenobjekts.";
+ aStr.append(RTL_CONSTASCII_STRINGPARAM(
+ "eines Zeichenobjekts."));
}
else
{
- aStr += "von ";
- aStr += ByteString::CreateFromInt32( nCloneErrCnt );
- aStr += " Zeichenobjekten.";
+ aStr.append(RTL_CONSTASCII_STRINGPARAM("von "));
+ aStr.append(static_cast<sal_Int32>(nCloneErrCnt));
+ aStr.append(RTL_CONSTASCII_STRINGPARAM(" Zeichenobjekten."));
}
- aStr += " Objektverbindungen werden nicht mitkopiert.";
+ aStr.append(RTL_CONSTASCII_STRINGPARAM(
+ " Objektverbindungen werden nicht mitkopiert."));
- OSL_FAIL(aStr.GetBuffer());
+ OSL_FAIL(aStr.getStr());
#endif
}
}
diff --git a/svx/source/table/tablertfexporter.cxx b/svx/source/table/tablertfexporter.cxx
index ec26cb0..af5e3dc 100644
--- a/svx/source/table/tablertfexporter.cxx
+++ b/svx/source/table/tablertfexporter.cxx
@@ -147,7 +147,7 @@ void SdrTableRtfExporter::WriteRow( const Reference< XPropertySet >& xRowSet, sa
xRowSet->getPropertyValue( msSize ) >>= nRowHeight;
mrStrm << OOO_STRING_SVTOOLS_RTF_TROWD << OOO_STRING_SVTOOLS_RTF_TRGAPH << "30" << OOO_STRING_SVTOOLS_RTF_TRLEFT << "-30";
- mrStrm << OOO_STRING_SVTOOLS_RTF_TRRH << ByteString::CreateFromInt32( nRowHeight ).GetBuffer();
+ mrStrm << OOO_STRING_SVTOOLS_RTF_TRRH << rtl::OString::valueOf(nRowHeight).getStr();
const sal_Int32 nColCount = mxTable->getColumnCount();
for( sal_Int32 nCol = 0; nCol < nColCount; nCol++ )
@@ -157,29 +157,7 @@ void SdrTableRtfExporter::WriteRow( const Reference< XPropertySet >& xRowSet, sa
if( !xCell.is() )
continue;
-/*
- const sal_Bool bIsMerged = xCell->isMerged();
- const sal_Int32 nRowSpan = xCell->getRowSpan();
- const sal_Int32 nColSpan = xCell->getColumnSpan();
-
- const sal_Char* pChar;
-
- if( !bIsMerged && ((nRowSpan > 1) || (nColSpan > 1)) )
- mrStrm << OOO_STRING_SVTOOLS_RTF_CLMGF; // The first cell in a range of table cells to be merged.
-
- SdrTextVertAdjust eVAdj = xCell->GetTextVerticalAdjust();
- switch( eVAdj )
- {
- case SVX_VER_JUSTIFY_TOP: pChar = OOO_STRING_SVTOOLS_RTF_CLVERTALT; break;
- case SVX_VER_JUSTIFY_CENTER: pChar = OOO_STRING_SVTOOLS_RTF_CLVERTALC; break;
- case SVX_VER_JUSTIFY_BOTTOM: pChar = OOO_STRING_SVTOOLS_RTF_CLVERTALB; break;
- case SVX_VER_JUSTIFY_STANDARD: pChar = OOO_STRING_SVTOOLS_RTF_CLVERTALB; break; //! Bottom
- default: pChar = NULL; break;
- }
- if ( pChar )
- mrStrm << pChar;
-*/
- mrStrm << OOO_STRING_SVTOOLS_RTF_CELLX << ByteString::CreateFromInt32( aColumnStart[nCol] ).GetBuffer();
+ mrStrm << OOO_STRING_SVTOOLS_RTF_CELLX << rtl::OString::valueOf(aColumnStart[nCol]).getStr();
if ( (nCol & 0x0F) == 0x0F )
mrStrm << RTFOutFuncs::sNewLine; // Zeilen nicht zu lang werden lassen
}
More information about the Libreoffice-commits
mailing list