[Libreoffice-commits] .: 12 commits - basic/source editeng/inc editeng/source sfx2/inc sfx2/source svx/inc svx/source xmloff/source
Caolán McNamara
caolan at kemper.freedesktop.org
Mon Jul 18 04:25:59 PDT 2011
basic/source/classes/sbunoobj.cxx | 22 -----
editeng/inc/editeng/brshitem.hxx | 2
editeng/inc/editeng/unonrule.hxx | 1
editeng/source/items/frmitems.cxx | 32 --------
editeng/source/uno/unonrule.cxx | 38 ---------
sfx2/inc/sfx2/dispatch.hxx | 1
sfx2/source/appl/app.cxx | 10 +-
sfx2/source/appl/appuno.cxx | 66 ++++++++++-------
sfx2/source/appl/workwin.cxx | 141 -------------------------------------
sfx2/source/bastyp/fltfnc.cxx | 16 ----
sfx2/source/bastyp/frmhtmlw.cxx | 41 +++++++---
sfx2/source/bastyp/helper.cxx | 26 ------
sfx2/source/control/bindings.cxx | 64 +++++++++-------
sfx2/source/control/dispatch.cxx | 18 ----
sfx2/source/control/objface.cxx | 51 ++++++++-----
sfx2/source/control/request.cxx | 22 +++--
sfx2/source/dialog/partwnd.cxx | 5 -
sfx2/source/dialog/templdlg.cxx | 12 ---
sfx2/source/doc/objstor.cxx | 4 -
sfx2/source/inc/helper.hxx | 1
sfx2/source/inc/templdgi.hxx | 1
sfx2/source/inc/workwin.hxx | 13 ---
svx/inc/svx/simptabl.hxx | 1
svx/inc/svx/svdorect.hxx | 4 -
svx/source/dialog/simptabl.cxx | 7 -
svx/source/form/fmtools.cxx | 19 ----
svx/source/svdraw/svdorect.cxx | 6 -
xmloff/source/draw/xexptran.cxx | 8 --
xmloff/source/text/txtsecte.cxx | 13 ---
xmloff/source/xforms/xformsapi.cxx | 26 ------
xmloff/source/xforms/xformsapi.hxx | 3
31 files changed, 154 insertions(+), 520 deletions(-)
New commits:
commit aec3a249866733d313e41a3e430361fb8f840751
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jul 17 22:49:42 2011 +0100
ByteString->rtl::OStringBuffer
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index ecc6a23..8234cec 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -218,9 +218,10 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
if ( !pItem )
{
#ifdef DBG_UTIL
- ByteString aStr( "No creator method for item: ");
- aStr += ByteString::CreateFromInt32( nSlotId );
- OSL_FAIL( aStr.GetBuffer() );
+ rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
+ "No creator method for item: "));
+ aStr.append(static_cast<sal_Int32>(nSlotId));
+ OSL_FAIL(aStr.getStr());
#endif
return;
}
@@ -267,9 +268,10 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
// so this should be notified as a warning only
if ( nCount != nSubCount )
{
- ByteString aStr( "MacroPlayer: wrong number of parameters for slot: ");
- aStr += ByteString::CreateFromInt32( nSlotId );
- DBG_WARNING( aStr.GetBuffer() );
+ rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
+ "MacroPlayer: wrong number of parameters for slot: "));
+ aStr.append(static_cast<sal_Int32>(nSlotId));
+ DBG_WARNING(aStr.getStr());
}
#endif
// complex property; collect sub items from the parameter set and reconstruct complex item
@@ -959,9 +961,10 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta
else
{
// we will not rely on the "toggle" ability of some property slots
- ByteString aStr( "Processing property slot without argument: ");
- aStr += ByteString::CreateFromInt32( nSlotId );
- OSL_FAIL( aStr.GetBuffer() );
+ rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
+ "Processing property slot without argument: "));
+ aStr.append(static_cast<sal_Int32>(nSlotId));
+ OSL_FAIL(aStr.getStr());
}
#endif
@@ -1249,9 +1252,10 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta
continue;
}
- ByteString aDbg( "Unknown item detected: ");
- aDbg += ByteString::CreateFromInt32( nId );
- DBG_ASSERT( nArg<nFormalArgs, aDbg.GetBuffer() );
+ rtl::OStringBuffer aDbg(RTL_CONSTASCII_STRINGPARAM(
+ "Unknown item detected: "));
+ aDbg.append(static_cast<sal_Int32>(nId));
+ DBG_ASSERT(nArg<nFormalArgs, aDbg.getStr());
}
}
}
@@ -1279,9 +1283,10 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta
pValue[nActProp].Name = String( String::CreateFromAscii( pSlot->pUnoName ) ) ;
if ( !pItem->QueryValue( pValue[nActProp].Value ) )
{
- ByteString aStr( "Item not convertable: ");
- aStr += ByteString::CreateFromInt32(nSlotId);
- OSL_FAIL( aStr.GetBuffer() );
+ rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
+ "Item not convertable: "));
+ aStr.append(static_cast<sal_Int32>(nSlotId));
+ OSL_FAIL(aStr.getStr());
}
}
else
@@ -1300,10 +1305,13 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta
pValue[nActProp].Name = aName;
if ( !pItem->QueryValue( pValue[nActProp++].Value, nSubId ) )
{
- ByteString aStr( "Sub item ");
- aStr += ByteString::CreateFromInt32( pType->aAttrib[n-1].nAID );
- aStr += " not convertable in slot: ";
- aStr += ByteString::CreateFromInt32(nSlotId);
+ rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
+ "Sub item "));
+ aStr.append(static_cast<sal_Int32>(
+ pType->aAttrib[n-1].nAID));
+ aStr.append(RTL_CONSTASCII_STRINGPARAM(
+ " not convertable in slot: "));
+ aStr.append(static_cast<sal_Int32>(nSlotId));
OSL_FAIL( aStr.GetBuffer() );
}
}
@@ -1328,9 +1336,10 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta
pValue[nActProp].Name = String( String::CreateFromAscii( rArg.pName ) ) ;
if ( !pItem->QueryValue( pValue[nActProp++].Value ) )
{
- ByteString aStr( "Item not convertable: ");
- aStr += ByteString::CreateFromInt32(rArg.nSlotId);
- OSL_FAIL( aStr.GetBuffer() );
+ rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
+ "Item not convertable: "));
+ aStr.append(static_cast<sal_Int32>(rArg.nSlotId));
+ OSL_FAIL(aStr.getStr());
}
}
else
@@ -1349,11 +1358,14 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta
pValue[nActProp].Name = aName;
if ( !pItem->QueryValue( pValue[nActProp++].Value, nSubId ) )
{
- ByteString aStr( "Sub item ");
- aStr += ByteString::CreateFromInt32( rArg.pType->aAttrib[n-1].nAID );
- aStr += " not convertable in slot: ";
- aStr += ByteString::CreateFromInt32(rArg.nSlotId);
- OSL_FAIL( aStr.GetBuffer() );
+ rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
+ "Sub item "));
+ aStr.append(static_cast<sal_Int32>(
+ rArg.pType->aAttrib[n-1].nAID));
+ aStr.append(RTL_CONSTASCII_STRINGPARAM(
+ " not convertable in slot: "));
+ aStr.append(static_cast<sal_Int32>(rArg.nSlotId));
+ OSL_FAIL(aStr.getStr());
}
}
}
diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx
index f4e14cd..933853c 100644
--- a/sfx2/source/control/objface.cxx
+++ b/sfx2/source/control/objface.cxx
@@ -41,6 +41,7 @@
#include "sfx2/sfxresid.hxx"
#include <sfx2/minarray.hxx>
#include <sfx2/objsh.hxx>
+#include <rtl/strbuf.hxx>
DBG_NAME(SfxInterface)
@@ -237,20 +238,26 @@ void SfxInterface::SetSlotMap( SfxSlot& rSlotMap, sal_uInt16 nSlotCount )
{
if ( pSlave->pLinkedSlot != pMasterSlot )
{
- ByteString aStr("Wrong Master/Slave- link: ");
- aStr += ByteString::CreateFromInt32(pMasterSlot->GetSlotId());
- aStr += " , ";
- aStr += ByteString::CreateFromInt32(pSlave->GetSlotId());
- OSL_FAIL(aStr.GetBuffer());
+ rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
+ "Wrong Master/Slave- link: "));
+ aStr.append(static_cast<sal_Int32>(
+ pMasterSlot->GetSlotId()));
+ aStr.append(RTL_CONSTASCII_STRINGPARAM(" , "));
+ aStr.append(static_cast<sal_Int32>(
+ pSlave->GetSlotId()));
+ OSL_FAIL(aStr.getStr());
}
if ( pSlave->nMasterSlotId != pMasterSlot->GetSlotId() )
{
- ByteString aStr("Wrong Master/Slave-Ids: ");
- aStr += ByteString::CreateFromInt32(pMasterSlot->GetSlotId());
- aStr += " , ";
- aStr += ByteString::CreateFromInt32(pSlave->GetSlotId());
- OSL_FAIL(aStr.GetBuffer());
+ rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
+ "Wrong Master/Slave-Ids: "));
+ aStr.append(static_cast<sal_Int32>(
+ pMasterSlot->GetSlotId()));
+ aStr.append(RTL_CONSTASCII_STRINGPARAM(" , "));
+ aStr.append(static_cast<sal_Int32>(
+ pSlave->GetSlotId()));
+ OSL_FAIL(aStr.getStr());
}
pSlave = pSlave->pNextSlot;
@@ -263,11 +270,13 @@ void SfxInterface::SetSlotMap( SfxSlot& rSlotMap, sal_uInt16 nSlotCount )
{
if ( pIter->pLinkedSlot->GetKind() != SFX_KIND_ENUM )
{
- ByteString aStr("Slave is no enum: ");
- aStr += ByteString::CreateFromInt32(pIter->GetSlotId());
- aStr += " , ";
- aStr += ByteString::CreateFromInt32(pIter->pLinkedSlot->GetSlotId());
- OSL_FAIL(aStr.GetBuffer());
+ rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
+ "Slave is no enum: "));
+ aStr.append(static_cast<sal_Int32>(pIter->GetSlotId()));
+ aStr.append(RTL_CONSTASCII_STRINGPARAM(" , "));
+ aStr.append(static_cast<sal_Int32>(
+ pIter->pLinkedSlot->GetSlotId()));
+ OSL_FAIL(aStr.getStr());
}
}
@@ -277,11 +286,13 @@ void SfxInterface::SetSlotMap( SfxSlot& rSlotMap, sal_uInt16 nSlotCount )
pCurSlot = pCurSlot->pNextSlot;
if ( pCurSlot->GetStateFnc() != pIter->GetStateFnc() )
{
- ByteString aStr("Linked Slots with different State Methods : ");
- aStr += ByteString::CreateFromInt32(pCurSlot->GetSlotId());
- aStr += " , ";
- aStr += ByteString::CreateFromInt32(pIter->GetSlotId());
- OSL_FAIL(aStr.GetBuffer());
+ rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
+ "Linked Slots with different State Methods : "));
+ aStr.append(static_cast<sal_Int32>(
+ pCurSlot->GetSlotId()));
+ aStr.append(RTL_CONSTASCII_STRINGPARAM(" , "));
+ aStr.append(static_cast<sal_Int32>(pIter->GetSlotId()));
+ OSL_FAIL(aStr.getStr());
}
}
while ( pCurSlot != pIter );
commit 09cf68dd274bdf34f50227444e5ab59f4c0ab054
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jul 17 22:19:41 2011 +0100
ByteString->rtl::OStringBuffer
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index aade9f7..2da6779 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -1756,20 +1756,24 @@ sal_uInt16 SfxBindings::EnterRegistrations(const char *pFile, int nLine)
(void)nLine;
DBG_MEMTEST();
#ifdef DBG_UTIL
- ByteString aMsg;
- aMsg.Fill( Min(nRegLevel, sal_uInt16(8) ) );
- aMsg += "this = ";
- aMsg += ByteString::CreateFromInt32((long)this);
- aMsg += " Level = ";
- aMsg += ByteString::CreateFromInt32(nRegLevel);
- aMsg += " SfxBindings::EnterRegistrations ";
- if(pFile) {
- aMsg += "File: ";
- aMsg += pFile;
- aMsg += " Line: ";
- aMsg += ByteString::CreateFromInt32(nLine);
- }
- DbgTrace( aMsg.GetBuffer() );
+ rtl::OStringBuffer aMsg;
+ sal_uInt16 nSpaces = Min(nRegLevel, sal_uInt16(8));
+ while (nSpaces--)
+ aMsg.append(' ');
+ aMsg.append(RTL_CONSTASCII_STRINGPARAM("this = "));
+ aMsg.append(reinterpret_cast<sal_Int64>(this));
+ aMsg.append(RTL_CONSTASCII_STRINGPARAM(" Level = "));
+ aMsg.append(static_cast<sal_Int32>(nRegLevel));
+ aMsg.append(RTL_CONSTASCII_STRINGPARAM(
+ " SfxBindings::EnterRegistrations "));
+ if (pFile)
+ {
+ aMsg.append(RTL_CONSTASCII_STRINGPARAM("File: "));
+ aMsg.append(pFile);
+ aMsg.append(RTL_CONSTASCII_STRINGPARAM(" Line: "));
+ aMsg.append(static_cast<sal_Int32>(nLine));
+ }
+ DbgTrace(aMsg.getStr());
#endif
// When bindings are locked, also lock sub bindings.
@@ -1869,20 +1873,24 @@ void SfxBindings::LeaveRegistrations( sal_uInt16 nLevel, const char *pFile, int
}
#ifdef DBG_UTIL
- ByteString aMsg;
- aMsg.Fill( Min(nRegLevel, sal_uInt16(8)) );
- aMsg += "this = ";
- aMsg += ByteString::CreateFromInt32((long)this);
- aMsg += " Level = ";
- aMsg += ByteString::CreateFromInt32(nRegLevel);
- aMsg += " SfxBindings::LeaveRegistrations ";
- if(pFile) {
- aMsg += "File: ";
- aMsg += pFile;
- aMsg += " Line: ";
- aMsg += ByteString::CreateFromInt32(nLine);
- }
- DbgTrace( aMsg.GetBuffer() );
+ rtl::OStringBuffer aMsg;
+ sal_uInt16 nSpaces = Min(nRegLevel, sal_uInt16(8));
+ while (nSpaces--)
+ aMsg.append(' ');
+ aMsg.append(RTL_CONSTASCII_STRINGPARAM("this = "));
+ aMsg.append(reinterpret_cast<sal_Int64>(this));
+ aMsg.append(RTL_CONSTASCII_STRINGPARAM(" Level = "));
+ aMsg.append(static_cast<sal_Int32>(nRegLevel));
+ aMsg.append(RTL_CONSTASCII_STRINGPARAM(
+ " SfxBindings::LeaveRegistrations "));
+ if (pFile)
+ {
+ aMsg.append(RTL_CONSTASCII_STRINGPARAM("File: "));
+ aMsg.append(pFile);
+ aMsg.append(RTL_CONSTASCII_STRINGPARAM(" Line: "));
+ aMsg.append(static_cast<sal_Int32>(nLine));
+ }
+ DbgTrace(aMsg.getStr());
#endif
}
commit efee9886d237f14e8394bdc423d646b494003149
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jul 17 10:58:28 2011 +0100
ByteString->OStringBUffer
diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx
index bc4801c..d578f4c 100644
--- a/sfx2/source/control/request.cxx
+++ b/sfx2/source/control/request.cxx
@@ -53,6 +53,7 @@
#include "macro.hxx"
#include <sfx2/objface.hxx>
#include <sfx2/appuno.hxx>
+#include <rtl/strbuf.hxx>
//===================================================================
@@ -219,9 +220,10 @@ SfxRequest::SfxRequest
#ifdef DBG_UTIL
else
{
- ByteString aStr( "Recording unsupported slot: ");
- aStr += ByteString::CreateFromInt32( pImp->pPool->GetSlotId(nSlotId) );
- OSL_FAIL( aStr.GetBuffer() );
+ rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
+ "Recording unsupported slot: "));
+ aStr.append(static_cast<sal_Int32>(pImp->pPool->GetSlotId(nSlotId)));
+ OSL_FAIL(aStr.getStr());
}
#endif
}
@@ -719,9 +721,10 @@ void SfxRequest::Done_Impl
// new Recording uses UnoName!
if ( !pImp->pSlot->pUnoName )
{
- ByteString aStr( "Recording not exported slot: ");
- aStr += ByteString::CreateFromInt32( pImp->pSlot->GetSlotId() );
- OSL_FAIL( aStr.GetBuffer() );
+ rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
+ "Recording not exported slot: "));
+ aStr.append(static_cast<sal_Int32>(pImp->pSlot->GetSlotId()));
+ OSL_FAIL(aStr.getStr());
}
if ( !pImp->pSlot->pUnoName ) // playing it safe
@@ -740,9 +743,10 @@ void SfxRequest::Done_Impl
#ifdef DBG_UTIL
if ( SFX_ITEM_SET != eState )
{
- ByteString aStr( "Recording property not available: ");
- aStr += ByteString::CreateFromInt32( pImp->pSlot->GetSlotId() );
- OSL_FAIL( aStr.GetBuffer() );
+ rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
+ "Recording property not available: "));
+ aStr.append(static_cast<sal_Int32>(pImp->pSlot->GetSlotId()));
+ OSL_FAIL(aStr.getStr());
}
#endif
uno::Sequence < beans::PropertyValue > aSeq;
commit 2cd552cc75ce043bcee29a8984198f8f359e47b7
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jul 16 22:48:44 2011 +0100
CHECKERROR unused
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index 43b0793..a94fff0 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -418,22 +418,6 @@ sal_uInt32 SfxFilterMatcher::GuessFilterIgnoringContent(
//----------------------------------------------------------------
-#define CHECKERROR() \
-if( nErr == 1 || nErr == USHRT_MAX || nErr == ULONG_MAX ) \
-{ \
- ByteString aText = "Fehler in FilterDetection: Returnwert ";\
- aText += ByteString::CreateFromInt32(nErr); \
- if( pFilter ) \
- { \
- aText += ' '; \
- aText += ByteString(U2S(pFilter->GetFilterName())); \
- } \
- OSL_FAIL( aText.GetBuffer() ); \
- nErr = ERRCODE_ABORT; \
-}
-
-//----------------------------------------------------------------
-
sal_uInt32 SfxFilterMatcher::GuessFilter( SfxMedium& rMedium, const SfxFilter**ppFilter, SfxFilterFlags nMust, SfxFilterFlags nDont ) const
{
return GuessFilterControlDefaultUI( rMedium, ppFilter, nMust, nDont, sal_True );
commit 3669c86b31e1a1eee81f02f9e0540d4fc5183e2b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jul 16 00:14:31 2011 +0100
ByteString->OStringBuffer
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index a362790..918e654 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -148,6 +148,7 @@
#include <svtools/ttprops.hxx>
#include <unotools/extendedsecurityoptions.hxx>
#include <rtl/instance.hxx>
+#include <rtl/strbuf.hxx>
using namespace ::com::sun::star;
@@ -329,12 +330,13 @@ SfxApplication::SfxApplication()
#else
if( !InitializeDde() )
{
- ByteString aStr( "No DDE-Service possible. Error: " );
+ rtl::OStringBuffer aStr(
+ RTL_CONSTASCII_STRINGPARAM("No DDE-Service possible. Error: "));
if( GetDdeService() )
- aStr += ByteString::CreateFromInt32(GetDdeService()->GetError());
+ aStr.append(static_cast<sal_Int32>(GetDdeService()->GetError()));
else
- aStr += '?';
- DBG_ASSERT( sal_False, aStr.GetBuffer() );
+ aStr.append('?');
+ DBG_ASSERT( sal_False, aStr.getStr() );
}
#endif
#endif
commit 3ffd31bd53bda9debeb632c2bad6e33922315132
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jul 15 22:19:28 2011 +0100
callcatcher: unused methods
diff --git a/svx/inc/svx/simptabl.hxx b/svx/inc/svx/simptabl.hxx
index 7e262de..5853016 100644
--- a/svx/inc/svx/simptabl.hxx
+++ b/svx/inc/svx/simptabl.hxx
@@ -106,7 +106,6 @@ public:
~SvxSimpleTable();
void UpdateViewSize();
- Size getPreferredContainerSize() const;
void InsertHeaderEntry(const XubString& rText,
sal_uInt16 nCol=HEADERBAR_APPEND,
diff --git a/svx/source/dialog/simptabl.cxx b/svx/source/dialog/simptabl.cxx
index 94039a9..62cfffe 100644
--- a/svx/source/dialog/simptabl.cxx
+++ b/svx/source/dialog/simptabl.cxx
@@ -170,13 +170,6 @@ void SvxSimpleTable::UpdateViewSize()
Invalidate();
}
-Size SvxSimpleTable::getPreferredContainerSize() const
-{
- Size aContainerNewSize(aHeaderBar.GetSizePixel());
- aContainerNewSize.Height()+=GetSizePixel().Height();
- return aContainerNewSize;
-}
-
void SvxSimpleTable::NotifyScrolled()
{
long nOffset=-GetXOffset();
commit 4ba6768653cb303c2d74514ce10d7ad60b850f53
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jul 14 22:27:00 2011 +0100
catch by const reference
diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx
index 58aa6d3..89c0ec3 100644
--- a/sfx2/source/bastyp/frmhtmlw.cxx
+++ b/sfx2/source/bastyp/frmhtmlw.cxx
@@ -249,7 +249,9 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL,
valstr.EraseTrailingChars();
OutMeta( rStrm, pIndent, name, valstr, sal_False,
eDestEnc, pNonConvertableChars );
- } catch (uno::Exception &) {
+ }
+ catch (const uno::Exception&)
+ {
// may happen with concurrent modification...
DBG_WARNING("SfxFrameHTMLWriter::Out_DocInfo: exception");
}
@@ -332,7 +334,7 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor(
}
rOut << sOut.getStr();
}
- catch (uno::Exception& )
+ catch (const uno::Exception&)
{
}
}
commit e1b4045439ac856ac84dd9757f1f9ed4b1876d5b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jul 14 22:26:18 2011 +0100
ByteString->rtl::OStringBuffer
diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx
index 2ae9a43..58aa6d3 100644
--- a/sfx2/source/bastyp/frmhtmlw.cxx
+++ b/sfx2/source/bastyp/frmhtmlw.cxx
@@ -56,6 +56,7 @@
#include <com/sun/star/document/XDocumentProperties.hpp>
#include <rtl/bootstrap.hxx>
+#include <rtl/strbuf.hxx>
// -----------------------------------------------------------------------
@@ -262,7 +263,7 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor(
{
try
{
- ByteString sOut;
+ rtl::OStringBuffer sOut;
::rtl::OUString aStr;
uno::Any aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameURL")) );
if ( (aAny >>= aStr) && aStr.getLength() )
@@ -272,29 +273,37 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor(
{
aURL = URIHelper::simpleNormalizedMakeRelative(
rBaseURL, aURL );
- ((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_src) += "=\"";
- rOut << sOut.GetBuffer();
+ sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_src)
+ .append(RTL_CONSTASCII_STRINGPARAM("=\""));
+ rOut << sOut.makeStringAndClear().getStr();
HTMLOutFuncs::Out_String( rOut, aURL, eDestEnc, pNonConvertableChars );
- sOut = '\"';
+ sOut.append('\"');
}
}
aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameName")) );
if ( (aAny >>= aStr) && aStr.getLength() )
{
- ((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_name) += "=\"";
- rOut << sOut.GetBuffer();
+ sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_name)
+ .append(RTL_CONSTASCII_STRINGPARAM("=\""));
+ rOut << sOut.makeStringAndClear().getStr();
HTMLOutFuncs::Out_String( rOut, aStr, eDestEnc, pNonConvertableChars );
- sOut = '\"';
+ sOut.append('\"');
}
sal_Int32 nVal = SIZE_NOT_SET;
aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameMarginWidth")) );
if ( (aAny >>= nVal) && nVal != SIZE_NOT_SET )
- (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_marginwidth) += '=') += ByteString::CreateFromInt32( nVal );
+ {
+ sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_marginwidth)
+ .append('=').append(nVal);
+ }
aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameMarginHeight")) );
if ( (aAny >>= nVal) && nVal != SIZE_NOT_SET )
- (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_marginheight) += '=') += ByteString::CreateFromInt32( nVal );
+ {
+ sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_marginheight)
+ .append('=').append(nVal);
+ }
sal_Bool bVal = sal_True;
aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsAutoScroll")) );
@@ -304,7 +313,8 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor(
if ( aAny >>= bVal )
{
const sal_Char *pStr = bVal ? sHTML_SC_yes : sHTML_SC_no;
- (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_scrolling) += '=') += pStr;
+ sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_scrolling)
+ .append(pStr);
}
}
@@ -316,12 +326,13 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor(
if ( aAny >>= bVal )
{
const char* pStr = bVal ? sHTML_SC_yes : sHTML_SC_no;
- (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_frameborder) += '=') += pStr;
+ sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_frameborder)
+ .append('=').append(pStr);
}
}
- rOut << sOut.GetBuffer();
+ rOut << sOut.getStr();
}
- catch ( uno::Exception& )
+ catch (uno::Exception& )
{
}
}
commit ef9239f42e98038b75c601e5b58b8b1fb8497a38
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jul 14 22:06:29 2011 +0100
callcatcher: remove unused methods
diff --git a/editeng/inc/editeng/brshitem.hxx b/editeng/inc/editeng/brshitem.hxx
index 3fe014a..417160f 100644
--- a/editeng/inc/editeng/brshitem.hxx
+++ b/editeng/inc/editeng/brshitem.hxx
@@ -116,7 +116,6 @@ public:
SvxGraphicPosition GetGraphicPos() const { return eGraphicPos; }
- void PurgeGraphic() const;
void PurgeMedium() const;
const Graphic* GetGraphic() const;
@@ -134,7 +133,6 @@ public:
static SvxGraphicPosition WallpaperStyle2GraphicPos( WallpaperStyle eStyle );
static WallpaperStyle GraphicPos2WallpaperStyle( SvxGraphicPosition ePos );
- CntWallpaperItem* CreateCntWallpaperItem() const;
};
#endif // #ifndef _SVX_BRSHITEM_HXX
diff --git a/editeng/inc/editeng/unonrule.hxx b/editeng/inc/editeng/unonrule.hxx
index 9b5e80b..665ca2a 100644
--- a/editeng/inc/editeng/unonrule.hxx
+++ b/editeng/inc/editeng/unonrule.hxx
@@ -43,7 +43,6 @@
EDITENG_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace > SvxCreateNumRule( const SvxNumRule* pRule ) throw();
EDITENG_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace > SvxCreateNumRule() throw();
const SvxNumRule& SvxGetNumRule( ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace > xRule ) throw( ::com::sun::star::lang::IllegalArgumentException );
-bool SvxGetNumRule( ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace > xRule, SvxNumRule& rNumRule );
EDITENG_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XAnyCompare > SvxCreateNumRuleCompare() throw();
class SvxUnoNumberingRules : public ::cppu::WeakAggImplHelper5< com::sun::star::container::XIndexReplace, com::sun::star::ucb::XAnyCompare,
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 7ae29a3..ef52df3 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -3849,19 +3849,6 @@ SvStream& SvxBrushItem::Store( SvStream& rStream , sal_uInt16 /*nItemVersion*/ )
}
// -----------------------------------------------------------------------
-// cast away const, since const is to be understood as a logical const
-// if GetGraphic() is called, the item should take care of getting a linked
-// graphic.
-// -----------------------------------------------------------------------
-
-void SvxBrushItem::PurgeGraphic() const
-{
- PurgeMedium();
- DELETEZ( pImpl->pGraphicObject );
- ((SvxBrushItem*)this)->bLoadAgain = sal_True;
-}
-
-// -----------------------------------------------------------------------
void SvxBrushItem::PurgeMedium() const
{
@@ -4076,25 +4063,6 @@ SvxBrushItem::SvxBrushItem( const CntWallpaperItem& rItem, sal_uInt16 _nWhich )
}
}
-CntWallpaperItem* SvxBrushItem::CreateCntWallpaperItem() const
-{
- CntWallpaperItem* pItem = new CntWallpaperItem( 0 );
- pItem->SetColor( aColor.GetColor() );
- pItem->SetStyle( (sal_uInt16)GraphicPos2WallpaperStyle( GetGraphicPos() ) );
- sal_Bool bLink = (pStrLink != 0);
- if( bLink )
- {
- String aURL = *pStrLink;
- pItem->SetBitmapURL( aURL );
- }
- if( pImpl->pGraphicObject )
- {
- DBG_ERRORFILE( "Don't know what to do with a graphic" );
- }
-
- return pItem;
-}
-
#ifdef _MSC_VER
#pragma optimize ( "", on )
#endif
diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx
index d78f71f..ee00ab2 100644
--- a/editeng/source/uno/unonrule.cxx
+++ b/editeng/source/uno/unonrule.cxx
@@ -499,44 +499,6 @@ const SvxNumRule& SvxGetNumRule( Reference< XIndexReplace > xRule ) throw( Illeg
return pRule->getNumRule();
}
-bool SvxGetNumRule( Reference< XIndexReplace > xRule, SvxNumRule& rNumRule )
-{
- SvxUnoNumberingRules* pRule = SvxUnoNumberingRules::getImplementation( xRule );
- if( pRule )
- {
- rNumRule = pRule->getNumRule();
- }
- else if( xRule.is() )
- {
- try
- {
- pRule = new SvxUnoNumberingRules( rNumRule );
-
- Reference< XIndexReplace > xDestRule( pRule );
-
- const sal_Int32 nCount = min( xRule->getCount(), xDestRule->getCount() );
- sal_Int32 nLevel;
- for( nLevel = 0; nLevel < nCount; nLevel++ )
- {
- xDestRule->replaceByIndex( nLevel, xRule->getByIndex( nLevel ) );
- }
-
- rNumRule = pRule->getNumRule();
- }
- catch( Exception& )
- {
- return false;
- }
- }
- else
- {
- return false;
- }
-
- return true;
-}
-
-///////////////////////////////////////////////////////////////////////
com::sun::star::uno::Reference< com::sun::star::container::XIndexReplace > SvxCreateNumRule( const SvxNumRule* pRule ) throw()
{
DBG_ASSERT( pRule, "No default SvxNumRule!" );
diff --git a/sfx2/inc/sfx2/dispatch.hxx b/sfx2/inc/sfx2/dispatch.hxx
index 5e7dd33..a3b0e4f 100644
--- a/sfx2/inc/sfx2/dispatch.hxx
+++ b/sfx2/inc/sfx2/dispatch.hxx
@@ -248,7 +248,6 @@ public:
SAL_DLLPRIVATE void SetModalMode_Impl( sal_Bool bOn );
SAL_DLLPRIVATE sal_Bool IsReadOnlyShell_Impl( sal_uInt16 nShell ) const;
SAL_DLLPRIVATE void RemoveShell_Impl( SfxShell& rShell );
- SAL_DLLPRIVATE void InsertShell_Impl( SfxShell& rShell, sal_uInt16 nPos );
SAL_DLLPRIVATE void DoParentActivate_Impl();
SAL_DLLPRIVATE void DoParentDeactivate_Impl();
SAL_DLLPRIVATE void DoActivate_Impl( sal_Bool bMDI, SfxViewFrame* pOld );
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 1ce246f..8402a6b 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -644,14 +644,6 @@ SfxWorkWindow::~SfxWorkWindow()
m_xLayoutManagerListener->dispose();
}
-SystemWindow* SfxWorkWindow::GetTopWindow() const
-{
- Window* pRet = pWorkWin;
- while ( pRet && !pRet->IsSystemWindow() )
- pRet = pRet->GetParent();
- return (SystemWindow*) pRet;
-}
-
void SfxWorkWindow::Lock_Impl( sal_Bool bLock )
{
if ( bLock )
@@ -668,37 +660,6 @@ void SfxWorkWindow::Lock_Impl( sal_Bool bLock )
ArrangeChilds_Impl();
}
-void SfxWorkWindow::ChangeWindow_Impl( Window *pNew )
-{
- Window *pOld = pWorkWin;
- pWorkWin = pNew;
- for ( sal_uInt16 nPos = 0; nPos < pChilds->Count(); ++nPos )
- {
- SfxChild_Impl *pCli = (*pChilds)[nPos];
- if ( pCli && pCli->pWin && pCli->pWin->GetParent() == pOld )
- {
- pCli->pWin->SetParent( pNew );
- }
- }
-}
-
-void SfxWorkWindow::SaveStatus_Impl()
-{
- sal_uInt16 nCount = pChildWins->Count();
- for ( sal_uInt16 n=0; n<nCount; n++ )
- {
- SfxChildWin_Impl* pCW = (*pChildWins)[n];
- SfxChildWindow *pChild = pCW->pWin;
- if (pChild)
- {
- sal_uInt16 nFlags = pCW->aInfo.nFlags;
- pCW->aInfo = pChild->GetInfo();
- pCW->aInfo.nFlags |= nFlags;
- SaveStatus_Impl(pChild, pCW->aInfo);
- }
- }
-}
-
//--------------------------------------------------------------------
// Helper method to release the child lists. Should the destructor not be
// called after this, instead work continues, then space for the object bars
@@ -989,25 +950,6 @@ SvBorder SfxWorkWindow::Arrange_Impl()
return IsDockingAllowed() ? aBorder : SvBorder();
}
-//--------------------------------------------------------------------
-// Close-Handler: The Configuration of the ChildWindows is saved.
-
-void SfxWorkWindow::Close_Impl()
-{
- for (sal_uInt16 n=0; n<pChildWins->Count(); n++)
- {
- SfxChildWin_Impl *pCW = (*pChildWins)[n];
- SfxChildWindow *pChild = pCW->pWin;
- if (pChild)
- {
- sal_uInt16 nFlags = pCW->aInfo.nFlags;
- pCW->aInfo = pChild->GetInfo();
- pCW->aInfo.nFlags |= nFlags;
- SaveStatus_Impl(pChild, pCW->aInfo);
- }
- }
-}
-
sal_Bool SfxWorkWindow::PrepareClose_Impl()
{
for (sal_uInt16 n=0; n<pChildWins->Count(); n++)
@@ -1047,30 +989,6 @@ SfxChild_Impl* SfxWorkWindow::RegisterChild_Impl( Window& rWindow,
//--------------------------------------------------------------------
-void SfxWorkWindow::AlignChild_Impl( Window& rWindow,
- const Size& rNewSize,
- SfxChildAlignment eAlign )
-{
- DBG_CHKTHIS(SfxWorkWindow, 0);
- DBG_ASSERT( SfxChildAlignValid(eAlign), "invalid align" );
-
- SfxChild_Impl *pChild = FindChild_Impl(rWindow);
- if ( pChild )
- {
- if (pChild->eAlign != eAlign)
- bSorted = sal_False;
-
- pChild->eAlign = eAlign;
- pChild->aSize = rNewSize;
- pChild->bResize = sal_True;
- }
- else {
- OSL_FAIL( "aligning unregistered child" );
- }
-}
-
-//--------------------------------------------------------------------
-
void SfxWorkWindow::ReleaseChild_Impl( Window& rWindow )
{
DBG_CHKTHIS(SfxWorkWindow, 0);
@@ -1224,15 +1142,6 @@ void SfxWorkWindow::ResetObjectBars_Impl()
(*pChildWins)[n]->nId = 0;
}
-void SfxWorkWindow::NextObjectBar_Impl( sal_uInt16 )
-{
-}
-
-sal_uInt16 SfxWorkWindow::HasNextObjectBar_Impl( sal_uInt16, String* )
-{
- return 0;
-}
-
//------------------------------------------------------------------------
void SfxWorkWindow::SetObjectBar_Impl( sal_uInt16 nPos, sal_uInt32 nResId,
@@ -1315,12 +1224,6 @@ sal_Bool SfxWorkWindow::IsVisible_Impl( sal_uInt16 nMode ) const
}
}
-Window* SfxWorkWindow::GetObjectBar_Impl( sal_uInt16, sal_uInt32 )
-{
- return NULL;
-}
-
-//------------------------------------------------------------------------
void SfxFrameWorkWin_Impl::UpdateObjectBars_Impl()
{
if ( pFrame->IsClosing_Impl() )
@@ -1731,36 +1634,6 @@ void SfxWorkWindow::SetStatusBar_Impl( sal_uInt32 nResId, SfxShell*, SfxBindings
#define SFX_ITEMTYPE_STATBAR 4
-void SfxWorkWindow::SetTempStatusBar_Impl( sal_Bool bSet )
-{
- if ( aStatBar.bTemp != bSet && bShowStatusBar && IsVisible_Impl() )
- {
- sal_Bool bOn = sal_False;
- sal_Bool bReset = sal_False;
- if ( bSet && !aStatBar.nId )
- {
- bReset = sal_True;
- SetStatusBar_Impl( SFX_ITEMTYPE_STATBAR, SFX_APP(), GetBindings() );
- }
-
- if ( aStatBar.nId && aStatBar.bOn && !bIsFullScreen )
- bOn = sal_True;
-
- aStatBar.bTemp = bSet;
- if ( !bOn || bReset || (!bSet && aStatBar.nId ) )
- {
- // Just do something if the temp settings really are causing
- // anything
- UpdateStatusBar_Impl();
- ArrangeChilds_Impl();
- ShowChilds_Impl();
- }
-
- if ( bReset )
- ResetStatusBar_Impl();
- }
-}
-
void SfxWorkWindow::UpdateStatusBar_Impl()
{
Reference< ::com::sun::star::beans::XPropertySet > xPropSet( GetFrameInterface(), UNO_QUERY );
@@ -2885,11 +2758,6 @@ SfxChildWinController_Impl::SfxChildWinController_Impl( sal_uInt16 nID, SfxWorkW
, pWorkwin( pWork )
{}
-::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SfxWorkWindow::CreateDispatch( const String& )
-{
- return ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >();
-}
-
void SfxChildWinController_Impl::StateChanged(
sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* )
{
@@ -2917,11 +2785,6 @@ void SfxWorkWindow::SetActiveChild_Impl( Window *pChild )
pActiveChild = pChild;
}
-Window* SfxWorkWindow::GetActiveChild_Impl()
-{
- return pActiveChild;
-}
-
sal_Bool SfxWorkWindow::ActivateNextChild_Impl( sal_Bool bForward )
{
// Sort all children under list
@@ -3036,10 +2899,6 @@ sal_Bool SfxWorkWindow::ActivateNextChild_Impl( sal_Bool bForward )
return sal_False;
}
-void SfxWorkWindow::SetObjectBarCustomizeMode_Impl( sal_Bool )
-{
-}
-
void SfxWorkWindow::DataChanged_Impl( const DataChangedEvent& )
{
sal_uInt16 n;
diff --git a/sfx2/source/bastyp/helper.cxx b/sfx2/source/bastyp/helper.cxx
index b7ecb65..3f5e75e 100644
--- a/sfx2/source/bastyp/helper.cxx
+++ b/sfx2/source/bastyp/helper.cxx
@@ -788,32 +788,6 @@ sal_Bool SfxContentHelper::MakeFolder( const String& rFolder )
// -----------------------------------------------------------------------
-ErrCode SfxContentHelper::QueryDiskSpace( const String& rPath, sal_Int64& rFreeBytes )
-{
- ErrCode nErr = 0;
- rFreeBytes = 0;
- INetURLObject aObj( rPath );
- DBG_ASSERT( aObj.GetProtocol() != INET_PROT_NOT_VALID, "Invalid URL!" );
- try
- {
- ::ucbhelper::Content aCnt( aObj.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ucb::XCommandEnvironment > () );
- aCnt.getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("FreeSpace")) ) >>= rFreeBytes;
- }
- catch( const ucb::CommandAbortedException& )
- {
- DBG_ERRORFILE( "CommandAbortedException" );
- nErr = ERRCODE_IO_GENERAL;
- }
- catch( const uno::Exception& )
- {
- DBG_ERRORFILE( "Any other exception" );
- nErr = ERRCODE_IO_GENERAL;
- }
- return nErr;
-}
-
-// -----------------------------------------------------------------------
-
sal_uIntPtr SfxContentHelper::GetSize( const String& rContent )
{
sal_uIntPtr nSize = 0;
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index c267137..70ead26 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -2801,24 +2801,6 @@ sal_Bool SfxDispatcher::IsReadOnlyShell_Impl( sal_uInt16 nShell ) const
class StackAccess_Impl : public SfxShellStack_Implarr_
{};
-void SfxDispatcher::InsertShell_Impl( SfxShell& rShell, sal_uInt16 nPos )
-{
- Flush();
-
- // The cast is because SfxShellStack_Impl member has non of its own
- ((StackAccess_Impl*) (&pImp->aStack))->Insert( nPos, &rShell );
- rShell.SetDisableFlags( pImp->nDisableFlags );
- rShell.DoActivate_Impl(pImp->pFrame, sal_True);
-
- if ( !SFX_APP()->IsDowning() )
- {
- pImp->bUpdated = sal_False;
- pImp->pCachedServ1 = 0;
- pImp->pCachedServ2 = 0;
- InvalidateBindings_Impl(sal_True);
- }
-}
-
void SfxDispatcher::RemoveShell_Impl( SfxShell& rShell )
{
Flush();
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 1f54aa5..d965286 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -869,18 +869,6 @@ void SfxTemplateDialog_Impl::EnableEdit(sal_Bool bEnable)
//-------------------------------------------------------------------------
-
-sal_uInt16 SfxCommonTemplateDialog_Impl::InfoOffsetToStyleNr(sal_uInt16 nId)
-{
- for ( size_t i = 0; i < pStyleFamilies->size(); i++ )
- if ( SfxFamilyIdToNId(pStyleFamilies->at( i )->GetFamily()) == nId+1 )
- return i;
- OSL_FAIL("Style Nummer not found");
- return 0;
-}
-
-//-------------------------------------------------------------------------
-
void SfxCommonTemplateDialog_Impl::ReadResource()
{
// Read global user resource
diff --git a/sfx2/source/inc/helper.hxx b/sfx2/source/inc/helper.hxx
index 93389a8..7856508 100644
--- a/sfx2/source/inc/helper.hxx
+++ b/sfx2/source/inc/helper.hxx
@@ -66,7 +66,6 @@ public:
static sal_Bool MoveTo( const String& rSource, const String& rDest, sal_Int32 nNameClash = com::sun::star::ucb::NameClash::ERROR );
static sal_Bool MakeFolder( const String& rFolder );
- static ErrCode QueryDiskSpace( const String& rPath, sal_Int64& rFreeBytes );
static sal_uIntPtr GetSize( const String& rContent );
// please don't use this!
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index 0d27f38..a26724a 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -224,7 +224,6 @@ protected:
// In which FamilyState do I have to look , in order to get the
// information of the ith Family in the pStyleFamilies.
sal_uInt16 StyleNrToInfoOffset( sal_uInt16 i );
- sal_uInt16 InfoOffsetToStyleNr( sal_uInt16 i );
void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx
index ecd1fa4..084385a 100644
--- a/sfx2/source/inc/workwin.hxx
+++ b/sfx2/source/inc/workwin.hxx
@@ -278,8 +278,6 @@ protected:
void CreateChildWin_Impl(SfxChildWin_Impl*,sal_Bool);
void RemoveChildWin_Impl(SfxChildWin_Impl*);
void Sort_Impl();
- void AlignChild_Impl( Window& rWindow, const Size& rNewSize,
- SfxChildAlignment eAlign );
SfxChild_Impl* FindChild_Impl( const Window& rWindow ) const;
virtual sal_Bool RequestTopToolSpacePixel_Impl( SvBorder aBorder );
virtual Rectangle GetTopRect_Impl();
@@ -290,7 +288,6 @@ protected:
public:
SfxWorkWindow( Window *pWin, SfxBindings& rBindings, SfxWorkWindow* pParent = NULL);
virtual ~SfxWorkWindow();
- SystemWindow* GetTopWindow() const;
SfxBindings& GetBindings()
{ return *pBindings; }
Window* GetWindow() const
@@ -306,7 +303,6 @@ public:
{ return bInternalDockingAllowed; }
SfxWorkWindow* GetParent_Impl() const
{ return pParent; }
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > CreateDispatch( const String& );
// Methods for all Child windows
void DataChanged_Impl( const DataChangedEvent& rDCEvt );
@@ -314,11 +310,9 @@ public:
SfxChild_Impl* RegisterChild_Impl( Window& rWindow, SfxChildAlignment eAlign, sal_Bool bCanGetFocus=sal_False );
void ShowChilds_Impl();
void HideChilds_Impl();
- void Close_Impl();
sal_Bool PrepareClose_Impl();
virtual void ArrangeChilds_Impl( sal_Bool bForce = sal_True );
void DeleteControllers_Impl();
- void SaveStatus_Impl();
void HidePopups_Impl(sal_Bool bHide, sal_Bool bParent=sal_False, sal_uInt16 nId=0);
void ConfigChild_Impl(SfxChildIdentifier,
SfxDockingConfig, sal_uInt16);
@@ -334,16 +328,12 @@ public:
void ResetObjectBars_Impl();
void SetObjectBar_Impl( sal_uInt16 nPos, sal_uInt32 nResId,
SfxInterface *pIFace, const String* pName=0 );
- Window* GetObjectBar_Impl( sal_uInt16 nPos, sal_uInt32 nResId );
bool KnowsObjectBar_Impl( sal_uInt16 nPos ) const;
sal_Bool IsVisible_Impl();
void MakeVisible_Impl( sal_Bool );
void SetObjectBarVisibility_Impl( sal_uInt16 nVis );
sal_Bool IsContainer_Impl() const;
void Lock_Impl( sal_Bool );
- void NextObjectBar_Impl( sal_uInt16 nPos );
- sal_uInt16 HasNextObjectBar_Impl( sal_uInt16 nPos, String* pStr=0 );
- void SetObjectBarCustomizeMode_Impl( sal_Bool );
// Methods for ChildWindows
void UpdateChildWindows_Impl();
@@ -361,14 +351,11 @@ public:
sal_Bool IsVisible_Impl( sal_uInt16 nMode ) const;
void DisableChildWindow_Impl( sal_uInt16 nId, sal_Bool bDisable );
sal_Bool IsFloating( sal_uInt16 nId );
- void ChangeWindow_Impl( Window *pNew );
void SetActiveChild_Impl( Window *pChild );
- Window* GetActiveChild_Impl();
virtual sal_Bool ActivateNextChild_Impl( sal_Bool bForward = sal_True );
bool AllowChildWindowCreation_Impl( const SfxChildWin_Impl& i_rCW ) const;
// Methods for StatusBar
- void SetTempStatusBar_Impl( sal_Bool bSet );
void ResetStatusBar_Impl();
void SetStatusBar_Impl(sal_uInt32 nResId, SfxShell *pShell, SfxBindings& );
void UpdateStatusBar_Impl();
diff --git a/svx/inc/svx/svdorect.hxx b/svx/inc/svx/svdorect.hxx
index 28593c8..de815a4 100644
--- a/svx/inc/svx/svdorect.hxx
+++ b/svx/inc/svx/svdorect.hxx
@@ -64,10 +64,6 @@ protected:
::boost::shared_ptr< XPolygon > mpXPoly;
protected:
- // Liefert sal_True, wenn das Painten ein Polygon erfordert.
- bool PaintNeedsXPoly(long nEckRad) const;
-
-protected:
XPolygon ImpCalcXPoly(const Rectangle& rRect1, long nRad1) const;
void SetXPolyDirty();
diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx
index 818e034..30c8ae3 100644
--- a/svx/source/svdraw/svdorect.cxx
+++ b/svx/source/svdraw/svdorect.cxx
@@ -123,12 +123,6 @@ void SdrRectObj::SetXPolyDirty()
mpXPoly.reset();
}
-bool SdrRectObj::PaintNeedsXPoly(long nEckRad) const
-{
- bool bNeed=aGeo.nDrehWink!=0 || aGeo.nShearWink!=0 || nEckRad!=0;
- return bNeed;
-}
-
XPolygon SdrRectObj::ImpCalcXPoly(const Rectangle& rRect1, long nRad1) const
{
XPolygon aXPoly(rRect1,nRad1,nRad1);
diff --git a/xmloff/source/draw/xexptran.cxx b/xmloff/source/draw/xexptran.cxx
index 4cbccfe..9f18076 100644
--- a/xmloff/source/draw/xexptran.cxx
+++ b/xmloff/source/draw/xexptran.cxx
@@ -147,14 +147,6 @@ void Imp_SkipNumberAndSpacesAndCommas(const OUString& rStr, sal_Int32& rPos,
Imp_SkipSpacesAndCommas(rStr, rPos, nLen);
}
-// #100617# Allow to skip doubles, too.
-void Imp_SkipDoubleAndSpacesAndCommas(const OUString& rStr, sal_Int32& rPos,
- const sal_Int32 nLen)
-{
- Imp_SkipDouble(rStr, rPos, nLen);
- Imp_SkipSpacesAndCommas(rStr, rPos, nLen);
-}
-
void Imp_PutNumberChar(OUString& rStr, sal_Int32 nValue)
{
OUStringBuffer sStringBuffer;
commit 27db97e6a07c92ee5c603e3228589b905c66f408
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jul 14 21:21:42 2011 +0100
debug-only method
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index e292c9d..ac055e4 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -3205,7 +3205,7 @@ sal_Bool SfxObjectShell::SaveCompleted( const uno::Reference< embed::XStorage >&
return bResult;
}
-
+#if OSL_DEBUG_LEVEL > 0
sal_Bool StoragesOfUnknownMediaTypeAreCopied_Impl( const uno::Reference< embed::XStorage >& xSource,
const uno::Reference< embed::XStorage >& xTarget )
{
@@ -3297,7 +3297,7 @@ sal_Bool StoragesOfUnknownMediaTypeAreCopied_Impl( const uno::Reference< embed::
return sal_True;
}
-
+#endif
sal_Bool SfxObjectShell::SwitchPersistance( const uno::Reference< embed::XStorage >& xStorage )
{
commit 224722bbb5e0a3232fb8dc904407aae2cb1875ae
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jul 14 21:17:14 2011 +0100
callcatcher: remove unused non-class level methods
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 5e564d0..e3ff076 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -434,28 +434,6 @@ template< class EXCEPTION >
return implGetExceptionMsg( e, ::getCppuType( &e ).getTypeName() );
}
-// Error-Message fuer WrappedTargetExceptions
-::rtl::OUString implGetWrappedMsg( const WrappedTargetException& e )
-{
- ::rtl::OUString aMsg;
- Any aWrappedAny = e.TargetException;
- Type aExceptionType = aWrappedAny.getValueType();
-
- // Really an Exception?
- if( aExceptionType.getTypeClass() == TypeClass_EXCEPTION )
- {
- Exception& e_ = *( (Exception*)aWrappedAny.getValue() );
- aMsg = implGetExceptionMsg( e_, ::rtl::OUString( aExceptionType.getTypeName() ) );
- }
- // Otherwise use WrappedTargetException itself
- else
- {
- aMsg = implGetExceptionMsg( e );
- }
-
- return aMsg;
-}
-
void implHandleBasicErrorException( BasicErrorException& e )
{
SbError nError = StarBASIC::GetSfxFromVBError( (sal_uInt16)e.ErrorCode );
diff --git a/sfx2/source/dialog/partwnd.cxx b/sfx2/source/dialog/partwnd.cxx
index 6018c70..b1aa1ef 100644
--- a/sfx2/source/dialog/partwnd.cxx
+++ b/sfx2/source/dialog/partwnd.cxx
@@ -166,11 +166,6 @@ SfxPartDockWnd_Impl::~SfxPartDockWnd_Impl()
//****************************************************************************
-Rectangle impl_Rectangle_Struct2Object( const ::com::sun::star::awt::Rectangle& aRectangleStruct )
-{
- return Rectangle(aRectangleStruct.X,aRectangleStruct.Y,aRectangleStruct.Width,aRectangleStruct.Height);
-}
-
void SfxPartDockWnd_Impl::Resize()
/* [Description]
diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx
index 475d31d..e9e9a48 100644
--- a/svx/source/form/fmtools.cxx
+++ b/svx/source/form/fmtools.cxx
@@ -462,25 +462,6 @@ sal_Int16 getControlTypeByObject(const Reference< ::com::sun::star::lang::XServi
}
//------------------------------------------------------------------------------
-void setConnection(const Reference< ::com::sun::star::sdbc::XRowSet>& _rxRowSet, const Reference< ::com::sun::star::sdbc::XConnection>& _rxConn)
-{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "fmtools::setConnection" );
- Reference< ::com::sun::star::beans::XPropertySet> xRowSetProps(_rxRowSet, UNO_QUERY);
- if (xRowSetProps.is())
- {
- try
- {
- Any aConn(makeAny(_rxConn));
- xRowSetProps->setPropertyValue(FM_PROP_ACTIVE_CONNECTION, aConn);
- }
- catch(Exception&)
- {
- OSL_FAIL("::setConnection : could not set the connection !");
- }
-
- }
-}
-//------------------------------------------------------------------------------
sal_Bool isRowSetAlive(const Reference< XInterface >& _rxRowSet)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen at sun.com", "fmtools::isRowSetAlive" );
commit 4c7473e27787d15c32749b65e9ad742b51658ac2
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jul 14 21:16:35 2011 +0100
callcatcher: remove unused non-class level methods
diff --git a/xmloff/source/text/txtsecte.cxx b/xmloff/source/text/txtsecte.cxx
index 2a3380a..5ec9ebe 100644
--- a/xmloff/source/text/txtsecte.cxx
+++ b/xmloff/source/text/txtsecte.cxx
@@ -75,19 +75,6 @@ using ::com::sun::star::container::XIndexReplace;
using ::com::sun::star::container::XNamed;
using ::com::sun::star::lang::XServiceInfo;
-Reference<XText> lcl_findXText(const Reference<XTextSection>& rSect)
-{
- Reference<XText> xText;
-
- Reference<XTextContent> xTextContent(rSect, UNO_QUERY);
- if (xTextContent.is())
- {
- xText.set(xTextContent->getAnchor()->getText());
- }
-
- return xText;
-}
-
void XMLTextParagraphExport::exportListAndSectionChange(
Reference<XTextSection> & rPrevSection,
const Reference<XTextContent> & rNextSectionContent,
diff --git a/xmloff/source/xforms/xformsapi.cxx b/xmloff/source/xforms/xformsapi.cxx
index f166ad1..5d6b7b4 100644
--- a/xmloff/source/xforms/xformsapi.cxx
+++ b/xmloff/source/xforms/xformsapi.cxx
@@ -191,32 +191,6 @@ void lcl_setValue( Reference<XPropertySet>& xPropertySet,
xPropertySet->setPropertyValue( rName, rAny );
}
-
-Reference<XPropertySet> lcl_getXFormsModel( const Reference<frame::XModel>& xDoc )
-{
- Reference<XPropertySet> xRet;
- try
- {
- Reference<XFormsSupplier> xSupplier( xDoc, UNO_QUERY );
- if( xSupplier.is() )
- {
- Reference<XNameContainer> xForms = xSupplier->getXForms();
- if( xForms.is() )
- {
- Sequence<OUString> aNames = xForms->getElementNames();
- if( aNames.getLength() > 0 )
- xRet.set( xForms->getByName( aNames[0] ), UNO_QUERY );
- }
- }
- }
- catch( const Exception& )
- {
- ; // no success!
- }
-
- return xRet;
-}
-
#define TOKEN_MAP_ENTRY(NAMESPACE,TOKEN) { XML_NAMESPACE_##NAMESPACE, xmloff::token::XML_##TOKEN, xmloff::token::XML_##TOKEN }
static SvXMLTokenMapEntry aTypes[] =
{
diff --git a/xmloff/source/xforms/xformsapi.hxx b/xmloff/source/xforms/xformsapi.hxx
index 6864aa5..efa7199 100644
--- a/xmloff/source/xforms/xformsapi.hxx
+++ b/xmloff/source/xforms/xformsapi.hxx
@@ -71,9 +71,6 @@ void lcl_setValue(
lcl_setValue( xPropSet, rName, com::sun::star::uno::makeAny( aValue ) );
}
-
-com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> lcl_getXFormsModel( const com::sun::star::uno::Reference<com::sun::star::frame::XModel>& );
-
sal_uInt16 lcl_getTypeClass(
const com::sun::star::uno::Reference<com::sun::star::xforms::XDataTypeRepository>& xRepository,
const SvXMLNamespaceMap& rNamespaceMap,
More information about the Libreoffice-commits
mailing list