[Libreoffice-commits] .: 6 commits - editeng/inc editeng/source extensions/source icc/SampleICC-makefiles.patch sc/inc sc/source svl/inc svl/source svtools/inc svtools/source svx/inc svx/source sw/inc sw/source unotools/inc unotools/source unusedcode.easy
Caolán McNamara
caolan at kemper.freedesktop.org
Mon Nov 7 04:27:59 PST 2011
editeng/inc/editeng/editview.hxx | 2
editeng/source/editeng/editview.cxx | 17 -
editeng/source/editeng/impedit.hxx | 3
editeng/source/editeng/impedit2.cxx | 105 ----------
extensions/source/bibliography/datman.cxx | 189 ++++++++-----------
extensions/source/plugin/base/xplugin.cxx | 10 -
extensions/source/plugin/inc/plugin/unx/mediator.hxx | 8
extensions/source/plugin/unx/sysplug.cxx | 26 +-
extensions/source/plugin/unx/unxmgr.cxx | 44 ++--
extensions/source/scanner/sane.cxx | 16 -
extensions/source/scanner/sane.hxx | 2
extensions/source/scanner/sanedlg.cxx | 50 ++---
icc/SampleICC-makefiles.patch | 3
sc/inc/externalrefmgr.hxx | 6
sc/inc/pivot.hxx | 1
sc/inc/queryentry.hxx | 1
sc/source/core/data/pivot2.cxx | 8
sc/source/core/tool/queryentry.cxx | 5
sc/source/filter/excel/xipivot.cxx | 5
sc/source/filter/excel/xistyle.cxx | 13 -
sc/source/filter/inc/xipivot.hxx | 2
sc/source/filter/inc/xistyle.hxx | 3
sc/source/ui/docshell/externalrefmgr.cxx | 20 --
svl/inc/svl/svstdarr.hxx | 5
svl/source/memtools/svarray.cxx | 1
svl/source/misc/inettype.cxx | 72 ++-----
svtools/inc/svtools/ctrlbox.hxx | 1
svtools/source/control/ctrlbox.cxx | 21 --
svx/inc/svx/svdobj.hxx | 3
svx/source/form/fmshimp.cxx | 65 ------
svx/source/inc/fmshimp.hxx | 1
svx/source/svdraw/svdobj.cxx | 11 -
sw/inc/doc.hxx | 7
sw/inc/editsh.hxx | 3
sw/source/core/doc/docchart.cxx | 5
sw/source/core/doc/doctxm.cxx | 9
sw/source/core/edit/edtox.cxx | 3
sw/source/core/inc/pagefrm.hxx | 16 -
sw/source/core/layout/paintfrm.cxx | 24 --
sw/source/ui/config/optload.cxx | 8
sw/source/ui/inc/optload.hxx | 1
sw/source/ui/index/swuiidxmrk.cxx | 14 -
unotools/inc/unotools/intlwrapper.hxx | 16 -
unotools/source/i18n/intlwrapper.cxx | 20 --
unusedcode.easy | 26 --
45 files changed, 213 insertions(+), 658 deletions(-)
New commits:
commit 6401ca3325d386067ab86dc36c5cea169449570e
Author: Daisuke Nishino <niboshi000 at gmail.com>
Date: Sun Nov 6 19:19:48 2011 +0900
Get rid of SvStringsSort
diff --git a/svl/inc/svl/svstdarr.hxx b/svl/inc/svl/svstdarr.hxx
index 50349f4..3d3cc80 100644
--- a/svl/inc/svl/svstdarr.hxx
+++ b/svl/inc/svl/svstdarr.hxx
@@ -57,11 +57,6 @@ SV_DECL_PTRARR_DEL_VISIBILITY( SvStringsDtor, StringPtr, 1, 1, SVL_DLLPUBLIC )
#define _SVSTDARR_STRINGSDTOR_DECL
#endif
-#ifndef _SVSTDARR_STRINGSSORT_DECL
-SV_DECL_PTRARR_SORT_VISIBILITY( SvStringsSort, StringPtr, 1, 1, SVL_DLLPUBLIC )
-#define _SVSTDARR_STRINGSSORT_DECL
-#endif
-
#ifndef _SVSTDARR_STRINGSSORTDTOR_DECL
SV_DECL_PTRARR_SORT_DEL_VISIBILITY( SvStringsSortDtor, StringPtr, 1, 1, SVL_DLLPUBLIC )
#define _SVSTDARR_STRINGSSORTDTOR_DECL
diff --git a/svl/source/memtools/svarray.cxx b/svl/source/memtools/svarray.cxx
index 95df58a..d1aeda7 100644
--- a/svl/source/memtools/svarray.cxx
+++ b/svl/source/memtools/svarray.cxx
@@ -63,7 +63,6 @@ sal_uInt16 SvPtrarr::GetPos( const VoidPtr& aElement ) const
SV_IMPL_PTRARR( SvStrings, StringPtr )
SV_IMPL_PTRARR( SvStringsDtor, StringPtr )
-SV_IMPL_OP_PTRARR_SORT( SvStringsSort, StringPtr )
SV_IMPL_OP_PTRARR_SORT( SvStringsSortDtor, StringPtr )
// ---------------- strings -------------------------------------
diff --git a/svl/source/misc/inettype.cxx b/svl/source/misc/inettype.cxx
index 7bd7f5b..c5a7603 100644
--- a/svl/source/misc/inettype.cxx
+++ b/svl/source/misc/inettype.cxx
@@ -34,6 +34,8 @@
#include <svl/inettype.hxx>
#include <svl/svl.hrc>
+#include <boost/ptr_container/ptr_map.hpp>
+
#include "getstringresource.hxx"
#ifndef _SVSTDARR_STRINGSSORT_DECL
@@ -62,30 +64,33 @@ struct TypeIDMapEntry
};
//============================================================================
-struct TypeNameMapEntry: public UniString
+struct TypeNameMapEntry
{
UniString m_aExtension;
INetContentType m_eTypeID;
- TypeNameMapEntry(const UniString & rType):
- UniString(rType), m_eTypeID(CONTENT_TYPE_UNKNOWN) {}
+ TypeNameMapEntry():
+ m_eTypeID(CONTENT_TYPE_UNKNOWN) {}
};
//============================================================================
-struct ExtensionMapEntry: public UniString
+struct ExtensionMapEntry
{
INetContentType m_eTypeID;
- ExtensionMapEntry(const UniString & rExt):
- UniString(rExt), m_eTypeID(CONTENT_TYPE_UNKNOWN) {}
+ ExtensionMapEntry():
+ m_eTypeID(CONTENT_TYPE_UNKNOWN) {}
};
//============================================================================
class Registration
{
+ typedef boost::ptr_map<UniString, TypeNameMapEntry> TypeNameMap;
+ typedef boost::ptr_map<UniString, ExtensionMapEntry> ExtensionMap;
+
Table m_aTypeIDMap; // map TypeID to TypeName, Presentation
- SvStringsSort m_aTypeNameMap; // map TypeName to TypeID, Extension
- SvStringsSort m_aExtensionMap; // map Extension to TypeID
+ TypeNameMap m_aTypeNameMap; // map TypeName to TypeID, Extension
+ ExtensionMap m_aExtensionMap; // map Extension to TypeID
sal_uInt32 m_nNextDynamicID;
public:
@@ -527,15 +532,6 @@ Registration::~Registration()
delete static_cast< TypeIDMapEntry * >(m_aTypeIDMap.GetObject(i));
}
m_aTypeIDMap.Clear();
- {for (sal_uInt16 i = 0; i < m_aTypeNameMap.Count(); ++i)
- delete static_cast< TypeNameMapEntry * >(m_aTypeNameMap.GetObject(i));
- }
- m_aTypeNameMap.Remove(sal_uInt16(0), m_aTypeNameMap.Count());
- {for (sal_uInt16 i = 0; i < m_aExtensionMap.Count(); ++i)
- delete
- static_cast< ExtensionMapEntry * >(m_aExtensionMap.GetObject(i));
- }
- m_aExtensionMap.Remove(sal_uInt16(0), m_aExtensionMap.Count());
}
//============================================================================
@@ -545,12 +541,10 @@ TypeNameMapEntry * Registration::getExtensionEntry(UniString const &
{
UniString aTheTypeName = rTypeName;
aTheTypeName.ToLowerAscii();
- sal_uInt16 nPos;
Registration &rRegistration = theRegistration::get();
- if (rRegistration.m_aTypeNameMap.Seek_Entry(&aTheTypeName, &nPos))
- return static_cast< TypeNameMapEntry * >(rRegistration.
- m_aTypeNameMap.
- GetObject(nPos));
+ typename TypeNameMap::iterator it = rRegistration.m_aTypeNameMap.find(aTheTypeName);
+ if (it != rRegistration.m_aTypeNameMap.end())
+ return it->second;
return 0;
}
@@ -581,18 +575,17 @@ INetContentType Registration::RegisterContentType(UniString const & rTypeName,
pTypeIDMapEntry->m_aSystemFileType = *pSystemFileType;
rRegistration.m_aTypeIDMap.Insert(eTypeID, pTypeIDMapEntry);
- TypeNameMapEntry * pTypeNameMapEntry = new TypeNameMapEntry(aTheTypeName);
+ std::auto_ptr<TypeNameMapEntry> pTypeNameMapEntry(new TypeNameMapEntry());
if (pExtension)
pTypeNameMapEntry->m_aExtension = *pExtension;
pTypeNameMapEntry->m_eTypeID = eTypeID;
- rRegistration.m_aTypeNameMap.Insert(pTypeNameMapEntry);
+ rRegistration.m_aTypeNameMap.insert(aTheTypeName, pTypeNameMapEntry);
if (pExtension)
{
- ExtensionMapEntry * pExtensionMapEntry
- = new ExtensionMapEntry(*pExtension);
+ std::auto_ptr<ExtensionMapEntry> pExtensionMapEntry(new ExtensionMapEntry());
pExtensionMapEntry->m_eTypeID = eTypeID;
- rRegistration.m_aExtensionMap.Insert(pExtensionMapEntry);
+ rRegistration.m_aExtensionMap.insert(*pExtension, pExtensionMapEntry);
}
return eTypeID;
@@ -606,13 +599,10 @@ INetContentType Registration::GetContentType(UniString const & rTypeName)
UniString aTheTypeName = rTypeName;
aTheTypeName.ToLowerAscii();
- sal_uInt16 nPos;
- return rRegistration.m_aTypeNameMap.Seek_Entry(&aTheTypeName, &nPos) ?
- static_cast< TypeNameMapEntry * >(rRegistration.
- m_aTypeNameMap.
- GetObject(nPos))->
- m_eTypeID :
- CONTENT_TYPE_UNKNOWN;
+ typename TypeNameMap::iterator it = rRegistration.m_aTypeNameMap.find(aTheTypeName);
+ return it != rRegistration.m_aTypeNameMap.end()
+ ? it->second->m_eTypeID
+ : CONTENT_TYPE_UNKNOWN;
}
//============================================================================
@@ -646,16 +636,10 @@ INetContentType Registration::GetContentType4Extension(UniString const &
{
Registration &rRegistration = theRegistration::get();
- sal_uInt16 nPos;
- return rRegistration.
- m_aExtensionMap.
- Seek_Entry(const_cast< UniString * >(&rExtension),
- &nPos) ?
- static_cast< ExtensionMapEntry * >(rRegistration.
- m_aExtensionMap.
- GetObject(nPos))->
- m_eTypeID :
- CONTENT_TYPE_UNKNOWN;
+ typename ExtensionMap::iterator it = rRegistration.m_aExtensionMap.find(rExtension);
+ return it != rRegistration.m_aExtensionMap.end()
+ ? it->second->m_eTypeID
+ : CONTENT_TYPE_UNKNOWN;
}
//============================================================================
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 6a03eb5..e4848f5 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -109,7 +109,6 @@ class SdrUndoAction;
class VirtualDevice;
class SfxPrinter;
class SvNumberFormatter;
-class SvStringsSort;
class SvxMacro;
class SvxMacroTableDtor;
class SwAutoCompleteWord;
@@ -1408,7 +1407,7 @@ public:
void SetDefaultTOXBase(const SwTOXBase& rBase);
// Key for management of index.
- sal_uInt16 GetTOIKeys( SwTOIKeyType eTyp, SvStringsSort& rArr ) const;
+ sal_uInt16 GetTOIKeys( SwTOIKeyType eTyp, std::vector<String>& rArr ) const;
// Sort table text.
sal_Bool SortTbl(const SwSelBoxes& rBoxes, const SwSortOptions&);
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index f821dca..70af368 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -66,7 +66,6 @@ class SwNewDBMgr;
struct SwDocStat;
class SvStringsDtor;
-class SvStringsSort;
class SwAutoCompleteWord;
class SwFmtRefMark;
@@ -416,7 +415,7 @@ public:
void ApplyAutoMark();
// Key for managing index.
- sal_uInt16 GetTOIKeys( SwTOIKeyType eTyp, SvStringsSort& rArr ) const;
+ sal_uInt16 GetTOIKeys( SwTOIKeyType eTyp, std::vector<String>& rArr ) const;
void SetOutlineNumRule(const SwNumRule&);
const SwNumRule* GetOutlineNumRule() const;
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index e8818e9..68ff6b9 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -104,10 +104,9 @@ typedef LinkStruct* LinkStructPtr;
SV_DECL_PTRARR(LinkStructArr, LinkStructPtr, 0, 5 )
SV_IMPL_PTRARR(LinkStructArr, LinkStructPtr)
-sal_uInt16 SwDoc::GetTOIKeys( SwTOIKeyType eTyp, SvStringsSort& rArr ) const
+sal_uInt16 SwDoc::GetTOIKeys( SwTOIKeyType eTyp, std::vector<String>& rArr ) const
{
- if( rArr.Count() )
- rArr.Remove( sal_uInt16(0), rArr.Count() );
+ rArr.clear();
// dann mal ueber den Pool und alle Primary oder Secondary heraussuchen
const SwTxtTOXMark* pMark;
@@ -129,10 +128,10 @@ sal_uInt16 SwDoc::GetTOIKeys( SwTOIKeyType eTyp, SvStringsSort& rArr ) const
pStr = &((SwTOXMark*)pItem)->GetSecondaryKey();
if( pStr->Len() )
- rArr.Insert( (StringPtr)pStr );
+ rArr.push_back( *pStr );
}
- return rArr.Count();
+ return rArr.size();
}
/*--------------------------------------------------------------------
diff --git a/sw/source/core/edit/edtox.cxx b/sw/source/core/edit/edtox.cxx
index 1e26155..0cde96d 100644
--- a/sw/source/core/edit/edtox.cxx
+++ b/sw/source/core/edit/edtox.cxx
@@ -62,7 +62,6 @@
#include <statstr.hrc>
#include <bookmrk.hxx>
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::i18n;
using namespace ::com::sun::star::lang;
@@ -254,7 +253,7 @@ const SwTOXType* SwEditShell::GetTOXType(TOXTypes eTyp, sal_uInt16 nId) const
Beschreibung: Schluessel fuer Stichwortverzeichnisse verwalten
--------------------------------------------------------------------*/
-sal_uInt16 SwEditShell::GetTOIKeys( SwTOIKeyType eTyp, SvStringsSort& rArr ) const
+sal_uInt16 SwEditShell::GetTOIKeys( SwTOIKeyType eTyp, std::vector<String>& rArr ) const
{
return GetDoc()->GetTOIKeys( eTyp, rArr );
}
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index 18daaa1..6ecced3 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -253,15 +253,19 @@ void SwIndexMarkDlg::InitControls()
aTypeDCB.InsertEntry( pSh->GetTOXType(TOX_USER, i)->GetTypeName() );
// read keywords primary
- SvStringsSort aArr;
+ std::vector<String> aArr;
nCount = pSh->GetTOIKeys( TOI_PRIMARY, aArr );
- for(i=0; i < nCount; ++i)
- aKeyDCB.InsertEntry( *aArr[ i ] );
+ std::sort(aArr.begin(), aArr.end());
+ for(typename std::vector<String>::iterator it = aArr.begin(); it != aArr.end(); ++it) {
+ aKeyDCB.InsertEntry( *it );
+ }
// read keywords secondary
nCount = pSh->GetTOIKeys( TOI_SECONDARY, aArr );
- for(i=0; i < nCount; ++i)
- aKey2DCB.InsertEntry( *aArr[ i ] );
+ std::sort(aArr.begin(), aArr.end());
+ for(typename std::vector<String>::iterator it = aArr.begin(); it != aArr.end(); ++it) {
+ aKey2DCB.InsertEntry( *it );
+ }
UpdateLanguageDependenciesForPhoneticReading();
diff --git a/unusedcode.easy b/unusedcode.easy
index 058c9ce..de04ee9 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -738,11 +738,6 @@ SvStringsISort::Insert(SvStringsISort const*, unsigned short, unsigned short)
SvStringsISort::Remove(String* const&, unsigned short)
SvStringsISort::Remove(unsigned short, unsigned short)
SvStringsISortDtor::Insert(String* const*, unsigned short)
-SvStringsSort::DeleteAndDestroy(unsigned short, unsigned short)
-SvStringsSort::Insert(String* const&, unsigned short&)
-SvStringsSort::Insert(String* const*, unsigned short)
-SvStringsSort::Insert(SvStringsSort const*, unsigned short, unsigned short)
-SvStringsSort::Remove(String* const&, unsigned short)
SvStringsSortDtor::Insert(String* const&, unsigned short&)
SvStringsSortDtor::Insert(String* const*, unsigned short)
SvStringsSortDtor::Insert(SvStringsSortDtor const*, unsigned short, unsigned short)
commit 0a590fc4f0ae79faeea402ec4868cfd89b5f0371
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Nov 7 11:37:01 2011 +0000
make extensions ByteString free
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index f825c6f..8668ed1 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -118,7 +118,7 @@ Reference< XConnection > getConnection(const ::rtl::OUString& _rURL)
{
xDataSource = Reference< XDataSource > (Reference< XNamingService > (xNamingContext, UNO_QUERY)->getRegisteredObject(_rURL), UNO_QUERY);
}
- catch(Exception &)
+ catch (const Exception&)
{
OSL_FAIL("Exception caught in ODatabaseContext::getRegisteredObject()");
}
@@ -138,15 +138,13 @@ Reference< XConnection > getConnection(const ::rtl::OUString& _rURL)
Reference<task::XInteractionHandler> xIHdl(xHdl, UNO_QUERY);
xConn = xComplConn->connectWithCompletion(xIHdl);
}
- catch(SQLException&)
+ catch (const SQLException&)
{
// TODO : a real error handling
}
- catch(Exception& e )
+ catch (const Exception&)
{
- (void) e; // make compiler happy
}
-
}
return xConn;
}
@@ -166,9 +164,8 @@ Reference< XConnection > getConnection(const Reference< XInterface > & xRowSe
DBG_WARNING("no active connection");
}
}
- catch(Exception& e )
+ catch (const Exception&)
{
- (void) e; // make compiler happy
OSL_FAIL("exception in getConnection");
}
@@ -204,17 +201,15 @@ Reference< XNameAccess > getColumns(const Reference< XForm > & _rxForm)
if (xSupplyCols.is())
xReturn = xSupplyCols->getColumns();
}
-#ifdef DBG_UTIL
- catch(Exception& e )
-#else
- catch(Exception&)
-#endif
+ catch (const Exception& e)
{
#ifdef DBG_UTIL
String sMsg(String::CreateFromAscii("::getColumns : catched an exception ("));
sMsg += String(e.Message);
sMsg.AppendAscii(") ...");
- OSL_FAIL( ByteString(sMsg, RTL_TEXTENCODING_ASCII_US ).GetBuffer());
+ OSL_FAIL(rtl::OUStringToOString(sMsg, RTL_TEXTENCODING_ASCII_US ).getStr());
+#else
+ (void)e;
#endif
}
@@ -625,13 +620,10 @@ DBChangeDialog_Impl::DBChangeDialog_Impl(Window* pParent, BibDataManager* pMan )
}
aSelectionLB.GetModel()->Resort();
}
- catch(Exception& e )
+ catch (const Exception&)
{
- (void) e; // make compiler happy
OSL_FAIL("Exception in BibDataManager::DBChangeDialog_Impl::DBChangeDialog_Impl");
}
-
-
}
IMPL_LINK(DBChangeDialog_Impl, DoubleClickHdl, SvTabListBox*, /*pLB*/)
@@ -855,9 +847,8 @@ void BibDataManager::InsertFields(const Reference< XFormComponent > & _rxGrid)
xColContainer->insertByName( *pFields, makeAny( xCurrentCol ) );
}
}
- catch(Exception& e )
+ catch (const Exception&)
{
- (void) e; // make compiler happy
OSL_FAIL("Exception in BibDataManager::InsertFields");
}
}
@@ -887,13 +878,11 @@ Reference< awt::XControlModel > BibDataManager::updateGridModel(const Reference<
Reference< XFormComponent > xFormComp( m_xGridModel, UNO_QUERY );
InsertFields( xFormComp );
}
- catch(Exception& e )
+ catch (const Exception&)
{
- (void) e; // make compiler happy
OSL_FAIL("::updateGridModel: something went wrong !");
}
-
return m_xGridModel;
}
@@ -971,13 +960,11 @@ Reference< XForm > BibDataManager::createDatabaseForm(BibDBDescriptor& rDesc)
}
}
}
- catch(Exception& e )
+ catch (const Exception&)
{
- (void) e; // make compiler happy
OSL_FAIL("::createDatabaseForm: something went wrong !");
}
-
return xResult;
}
//------------------------------------------------------------------------
@@ -994,13 +981,11 @@ Sequence< ::rtl::OUString > BibDataManager::getDataSources()
if (xTables.is())
aTableNameSeq = xTables->getElementNames();
}
- catch(Exception& e )
+ catch (const Exception&)
{
- (void) e; // make compiler happy
OSL_FAIL("::getDataSources: something went wrong !");
}
-
return aTableNameSeq;
}
//------------------------------------------------------------------------
@@ -1022,7 +1007,7 @@ void BibDataManager::setFilter(const ::rtl::OUString& rQuery)
xFormProps->setPropertyValue( C2U( "ApplyFilter" ), makeAny( sal_True ) );
reload();
}
- catch(Exception&)
+ catch (const Exception&)
{
DBG_UNHANDLED_EXCEPTION();
}
@@ -1039,7 +1024,7 @@ void BibDataManager::setFilter(const ::rtl::OUString& rQuery)
Reference< XPropertySet > xFormProps( m_xForm, UNO_QUERY_THROW );
OSL_VERIFY( xFormProps->getPropertyValue( C2U( "Filter" ) ) >>= aQueryString );
}
- catch( const Exception& )
+ catch (const Exception&)
{
DBG_UNHANDLED_EXCEPTION();
}
@@ -1234,12 +1219,10 @@ void BibDataManager::setActiveDataTable(const ::rtl::OUString& rTable)
}
}
}
- catch(Exception& e )
+ catch (const Exception&)
{
- (void) e; // make compiler happy
OSL_FAIL("::setActiveDataTable: something went wrong !");
}
-
}
//------------------------------------------------------------------------
@@ -1367,13 +1350,11 @@ Reference< awt::XControlModel > BibDataManager::createGridModel(const ::rtl::OUS
xPropSet->setPropertyValue( uProp, makeAny( sId ) );
}
}
- catch(Exception& e )
+ catch (const Exception&)
{
- (void) e; // make compiler happy
OSL_FAIL("::createGridModel: something went wrong !");
}
-
return xModel;
}
//------------------------------------------------------------------------
@@ -1489,9 +1470,8 @@ Reference< awt::XControlModel > BibDataManager::loadControlModel(
}
}
}
- catch(Exception& e )
+ catch (const Exception&)
{
- (void) e; // make compiler happy
OSL_FAIL("::loadControlModel: something went wrong !");
}
return xModel;
@@ -1529,104 +1509,97 @@ void BibDataManager::propertyChange(const beans::PropertyChangeEvent& evt) throw
xLocate->moveToBookmark(aUID);
}
}
- catch(Exception& e )
+ catch (const Exception&)
{
- (void) e; // make compiler happy
OSL_FAIL("::propertyChange: something went wrong !");
}
-
-
}
+
//------------------------------------------------------------------------
void BibDataManager::SetMeAsUidListener()
{
-try
-{
- Reference< XNameAccess > xFields = getColumns( m_xForm );
- if (!xFields.is())
- return;
-
- Sequence< ::rtl::OUString > aFields(xFields->getElementNames());
- const ::rtl::OUString* pFields = aFields.getConstArray();
- sal_Int32 nCount=aFields.getLength();
- String StrUID(C2S(STR_UID));
- ::rtl::OUString theFieldName;
- for( sal_Int32 i=0; i<nCount; i++ )
+ try
{
- String aName= pFields[i];
+ Reference< XNameAccess > xFields = getColumns( m_xForm );
+ if (!xFields.is())
+ return;
- if(aName.EqualsIgnoreCaseAscii(StrUID))
+ Sequence< ::rtl::OUString > aFields(xFields->getElementNames());
+ const ::rtl::OUString* pFields = aFields.getConstArray();
+ sal_Int32 nCount=aFields.getLength();
+ String StrUID(C2S(STR_UID));
+ ::rtl::OUString theFieldName;
+ for( sal_Int32 i=0; i<nCount; i++ )
{
- theFieldName=pFields[i];
- break;
+ String aName= pFields[i];
+
+ if(aName.EqualsIgnoreCaseAscii(StrUID))
+ {
+ theFieldName=pFields[i];
+ break;
+ }
}
- }
- if(theFieldName.getLength()>0)
- {
- Reference< XPropertySet > xPropSet;
- Any aElement;
+ if(theFieldName.getLength()>0)
+ {
+ Reference< XPropertySet > xPropSet;
+ Any aElement;
- aElement = xFields->getByName(theFieldName);
- xPropSet = *(Reference< XPropertySet > *)aElement.getValue();
+ aElement = xFields->getByName(theFieldName);
+ xPropSet = *(Reference< XPropertySet > *)aElement.getValue();
- xPropSet->addPropertyChangeListener(FM_PROP_VALUE, this);
- }
+ xPropSet->addPropertyChangeListener(FM_PROP_VALUE, this);
+ }
+ }
+ catch (const Exception&)
+ {
+ OSL_FAIL("Exception in BibDataManager::SetMeAsUidListener");
+ }
}
-catch(Exception& e )
-{
- (void) e; // make compiler happy
- OSL_FAIL("Exception in BibDataManager::SetMeAsUidListener");
-}
-
-}
//------------------------------------------------------------------------
void BibDataManager::RemoveMeAsUidListener()
{
-try
-{
- Reference< XNameAccess > xFields = getColumns( m_xForm );
- if (!xFields.is())
- return;
-
-
- Sequence< ::rtl::OUString > aFields(xFields->getElementNames());
- const ::rtl::OUString* pFields = aFields.getConstArray();
- sal_Int32 nCount=aFields.getLength();
- String StrUID(C2S(STR_UID));
- ::rtl::OUString theFieldName;
- for( sal_Int32 i=0; i<nCount; i++ )
+ try
{
- String aName= pFields[i];
+ Reference< XNameAccess > xFields = getColumns( m_xForm );
+ if (!xFields.is())
+ return;
- if(aName.EqualsIgnoreCaseAscii(StrUID))
- {
- theFieldName=pFields[i];
- break;
- }
- }
- if(theFieldName.getLength()>0)
- {
- Reference< XPropertySet > xPropSet;
- Any aElement;
+ Sequence< ::rtl::OUString > aFields(xFields->getElementNames());
+ const ::rtl::OUString* pFields = aFields.getConstArray();
+ sal_Int32 nCount=aFields.getLength();
+ String StrUID(C2S(STR_UID));
+ ::rtl::OUString theFieldName;
+ for( sal_Int32 i=0; i<nCount; i++ )
+ {
+ String aName= pFields[i];
- aElement = xFields->getByName(theFieldName);
- xPropSet = *(Reference< XPropertySet > *)aElement.getValue();
+ if(aName.EqualsIgnoreCaseAscii(StrUID))
+ {
+ theFieldName=pFields[i];
+ break;
+ }
+ }
- xPropSet->removePropertyChangeListener(FM_PROP_VALUE, this);
- }
+ if(theFieldName.getLength()>0)
+ {
+ Reference< XPropertySet > xPropSet;
+ Any aElement;
-}
-catch(Exception& e )
-{
- (void) e; // make compiler happy
- OSL_FAIL("Exception in BibDataManager::RemoveMeAsUidListener");
-}
+ aElement = xFields->getByName(theFieldName);
+ xPropSet = *(Reference< XPropertySet > *)aElement.getValue();
+ xPropSet->removePropertyChangeListener(FM_PROP_VALUE, this);
+ }
+ }
+ catch (const Exception&)
+ {
+ OSL_FAIL("Exception in BibDataManager::RemoveMeAsUidListener");
+ }
}
void BibDataManager::CreateMappingDialog(Window* pParent)
diff --git a/extensions/source/plugin/base/xplugin.cxx b/extensions/source/plugin/base/xplugin.cxx
index 09745a6..fd202ad 100644
--- a/extensions/source/plugin/base/xplugin.cxx
+++ b/extensions/source/plugin/base/xplugin.cxx
@@ -777,15 +777,15 @@ sal_Bool XPlugin_Impl::provideNewStream(const OUString& mimetype,
#endif
if( isfile && stype == NP_ASFILEONLY )
{
- OString aFileName;
+ rtl::OString aFileName;
if( url.compareToAscii( "file:", 5 ) == 0 )
{
OUString aSysName;
osl_getSystemPathFromFileURL( url.pData, &aSysName.pData );
- aFileName = OUStringToOString( aSysName, m_aEncoding );
+ aFileName = rtl::OUStringToOString( aSysName, m_aEncoding );
}
else
- aFileName = OUStringToOString( url, m_aEncoding );
+ aFileName = rtl::OUStringToOString( url, m_aEncoding );
m_pPluginComm->
NPP_StreamAsFile( &m_aInstance,
pStream->getStream(),
@@ -989,7 +989,7 @@ PluginInputStream::~PluginInputStream()
m_aFileStream.Close();
if( m_pPlugin )
{
- ByteString aFileName( aFile, m_pPlugin->getTextEncoding() );
+ rtl::OString aFileName(rtl::OUStringToOString(aFile, m_pPlugin->getTextEncoding()));
if( m_pPlugin->getPluginComm() && m_nMode != -1 )
// mode -1 means either an error occurred,
// or the plugin is already disposing
@@ -1000,7 +1000,7 @@ PluginInputStream::~PluginInputStream()
m_pPlugin->getPluginComm()->
NPP_StreamAsFile( m_pPlugin->getNPPInstance(),
&m_aNPStream,
- aFileName.GetBuffer() );
+ aFileName.getStr() );
}
m_pPlugin->getPluginComm()->NPP_SetWindow( m_pPlugin );
m_pPlugin->getInputStreams().remove( this );
diff --git a/extensions/source/plugin/inc/plugin/unx/mediator.hxx b/extensions/source/plugin/inc/plugin/unx/mediator.hxx
index 72c0e3e..6a0dd05 100644
--- a/extensions/source/plugin/inc/plugin/unx/mediator.hxx
+++ b/extensions/source/plugin/inc/plugin/unx/mediator.hxx
@@ -114,10 +114,10 @@ public:
void invalidate() { m_bValid = false; }
sal_uLong SendMessage( sal_uLong nBytes, const char* pBytes, sal_uLong nMessageID = 0 );
- sal_uLong SendMessage( const ByteString& rMessage, sal_uLong nMessageID = 0 )
- {
- return SendMessage( rMessage.Len(), rMessage.GetBuffer(), nMessageID );
- }
+ sal_uLong SendMessage( const rtl::OString& rMessage, sal_uLong nMessageID = 0 )
+ {
+ return SendMessage( rMessage.getLength(), rMessage.getStr(), nMessageID );
+ }
sal_Bool WaitForMessage( sal_uLong nTimeOut = 5000 );
// timeout in ms
diff --git a/extensions/source/plugin/unx/sysplug.cxx b/extensions/source/plugin/unx/sysplug.cxx
index e277217..dbc1514 100644
--- a/extensions/source/plugin/unx/sysplug.cxx
+++ b/extensions/source/plugin/unx/sysplug.cxx
@@ -58,22 +58,24 @@ UnxPluginComm::UnxPluginComm(
PluginComm( ::rtl::OUStringToOString( library, osl_getThreadTextEncoding() ), false ),
PluginConnector( nDescriptor2 )
{
- char pDesc[32];
- char pWindow[32];
- sprintf( pWindow, "%d", (int)aParent );
- sprintf( pDesc, "%d", nDescriptor1 );
- ByteString aLib( library, osl_getThreadTextEncoding() );
rtl::OString path;
- if (!getPluginappPath(&path)) {
+ if (!getPluginappPath(&path))
+ {
fprintf( stderr, "cannot construct path to pluginapp.bin\n" );
m_nCommPID = -1;
return;
}
+ char pDesc[32];
+ char pWindow[32];
+ sprintf( pWindow, "%d", (int)aParent );
+ sprintf( pDesc, "%d", nDescriptor1 );
+ rtl::OString aLib(rtl::OUStringToOString(library, osl_getThreadTextEncoding()));
+
char const* pArgs[5];
pArgs[0] = path.getStr();
pArgs[1] = pDesc;
- pArgs[2] = aLib.GetBuffer();
+ pArgs[2] = aLib.getStr();
pArgs[3] = pWindow;
pArgs[4] = NULL;
@@ -83,11 +85,11 @@ UnxPluginComm::UnxPluginComm(
#endif
if( ! ( m_nCommPID = fork() ) )
- {
- execvp( pArgs[0], const_cast< char ** >(pArgs) );
- fprintf( stderr, "Error: could not exec %s\n", pArgs[0] );
- _exit(255);
- }
+ {
+ execvp( pArgs[0], const_cast< char ** >(pArgs) );
+ fprintf( stderr, "Error: could not exec %s\n", pArgs[0] );
+ _exit(255);
+ }
if( m_nCommPID != -1 )
{
diff --git a/extensions/source/plugin/unx/unxmgr.cxx b/extensions/source/plugin/unx/unxmgr.cxx
index 7c77c83..270ba93 100644
--- a/extensions/source/plugin/unx/unxmgr.cxx
+++ b/extensions/source/plugin/unx/unxmgr.cxx
@@ -56,14 +56,14 @@ using ::rtl::OStringBuffer;
using ::rtl::OStringToOUString;
// Unix specific implementation
-static bool CheckPlugin( const ByteString& rPath, list< PluginDescription* >& rDescriptions )
+static bool CheckPlugin( const rtl::OString& rPath, list< PluginDescription* >& rDescriptions )
{
#if OSL_DEBUG_LEVEL > 1
- fprintf( stderr, "Trying plugin %s ... ", rPath.GetBuffer() );
+ fprintf( stderr, "Trying plugin %s ... ", rPath.getStr() );
#endif
- xub_StrLen nPos = rPath.SearchBackward( '/' );
- if( nPos == STRING_NOTFOUND )
+ sal_Int32 nPos = rPath.lastIndexOf('/');
+ if (nPos == -1)
{
#if OSL_DEBUG_LEVEL > 1
fprintf( stderr, "no absolute path to plugin\n" );
@@ -71,29 +71,29 @@ static bool CheckPlugin( const ByteString& rPath, list< PluginDescription* >& rD
return false;
}
- ByteString aBaseName = rPath.Copy( nPos+1 );
- if( aBaseName.Equals( "libnullplugin.so" ) )
+ rtl::OString aBaseName = rPath.copy(nPos+1);
+ if (aBaseName.equalsL(RTL_CONSTASCII_STRINGPARAM("libnullplugin.so")))
{
#if OSL_DEBUG_LEVEL > 1
- fprintf( stderr, "don't like %s\n", aBaseName.GetBuffer() );
+ fprintf( stderr, "don't like %s\n", aBaseName.getStr() );
#endif
return false;
}
struct stat aStat;
- if( stat( rPath.GetBuffer(), &aStat ) || ! S_ISREG( aStat.st_mode ) )
+ if (stat(rPath.getStr(), &aStat) || !S_ISREG(aStat.st_mode))
{
#if OSL_DEBUG_LEVEL > 1
- fprintf( stderr, "%s is not a regular file\n", rPath.GetBuffer() );
+ fprintf( stderr, "%s is not a regular file\n", rPath.getStr() );
#endif
return false;
}
-
rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
rtl::OString path;
- if (!UnxPluginComm::getPluginappPath(&path)) {
+ if (!UnxPluginComm::getPluginappPath(&path))
+ {
#if OSL_DEBUG_LEVEL > 1
fprintf( stderr, "cannot construct path to pluginapp.bin\n" );
#endif
@@ -209,7 +209,7 @@ static void CheckPluginRegistryFiles( const rtl::OString& rPath, list< PluginDes
for( nDotPos = nLineLen-1; nDotPos > 0 && aLine[nDotPos] != ':'; nDotPos-- )
;
if( aLine[0] == '/' && aLine[nDotPos] == ':' && aLine[nDotPos+1] == '$' )
- CheckPlugin( ByteString( aLine, nDotPos ), rDescriptions );
+ CheckPlugin( rtl::OString(aLine, nDotPos), rDescriptions );
}
fclose( fp );
}
@@ -270,16 +270,16 @@ Sequence<PluginDescription> XPluginManager_Impl::impl_getPluginDescriptions() th
rPaths.getConstArray()[i], aEncoding));
}
- ByteString aSearchPath = aSearchBuffer.makeStringAndClear();
+ rtl::OString aSearchPath = aSearchBuffer.makeStringAndClear();
- int nPaths = aSearchPath.GetTokenCount( ':' );
+ sal_Int32 nIndex = 0;
maxDirent u;
- for( i = 0; i < nPaths; i++ )
+ do
{
- ByteString aPath( aSearchPath.GetToken( i, ':' ) );
- if( aPath.Len() )
+ rtl::OString aPath(aSearchPath.getToken(0, ':', nIndex));
+ if (aPath.getLength())
{
- DIR* pDIR = opendir( aPath.GetBuffer() );
+ DIR* pDIR = opendir(aPath.getStr());
struct dirent* pDirEnt = NULL;
while( pDIR && ! readdir_r( pDIR, &u.asDirent, &pDirEnt ) && pDirEnt )
{
@@ -288,16 +288,16 @@ Sequence<PluginDescription> XPluginManager_Impl::impl_getPluginDescriptions() th
pBaseName[1] != '.' ||
pBaseName[2] != 0 )
{
- ByteString aFileName( aPath );
- aFileName += "/";
- aFileName += pBaseName;
- CheckPlugin( aFileName, aPlugins );
+ rtl::OStringBuffer aFileName(aPath);
+ aFileName.append('/').append(pBaseName);
+ CheckPlugin( aFileName.makeStringAndClear(), aPlugins );
}
}
if( pDIR )
closedir( pDIR );
}
}
+ while ( nIndex >= 0 );
// try ~/.mozilla/pluginreg.dat
rtl::OStringBuffer aBuf(256);
diff --git a/extensions/source/scanner/sane.cxx b/extensions/source/scanner/sane.cxx
index 39638ca..48eae47 100644
--- a/extensions/source/scanner/sane.cxx
+++ b/extensions/source/scanner/sane.cxx
@@ -156,7 +156,7 @@ SANE_Status Sane::ControlOption( int nOption, SANE_Action nAction,
pAction = "SANE_ACTION_SET_AUTO";break;
}
dbg_msg( "Option: \"%s\" action: %s\n",
- ByteString( GetOptionName( nOption ), gsl_getSystemTextEncoding() ).GetBuffer(),
+ rtl::OUStringToOString(GetOptionName(nOption), osl_getThreadTextEncoding()).getStr(),
pAction );
}
#endif
@@ -312,10 +312,10 @@ sal_Bool Sane::Open( const char* name )
if( mnDevice == -1 )
{
- ByteString aDevice( name );
+ rtl::OString aDevice( name );
for( int i = 0; i < nDevices; i++ )
{
- if( aDevice.Equals( ppDevices[i]->name ) )
+ if( aDevice.equals( ppDevices[i]->name ) )
{
mnDevice = i;
break;
@@ -351,10 +351,10 @@ void Sane::Close()
int Sane::GetOptionByName( const char* rName )
{
int i;
- ByteString aOption( rName );
+ rtl::OString aOption( rName );
for( i = 0; i < mnOptions; i++ )
{
- if( mppOptions[i]->name && aOption.Equals( mppOptions[i]->name ) )
+ if( mppOptions[i]->name && aOption.equals( mppOptions[i]->name ) )
return i;
}
return -1;
@@ -373,7 +373,7 @@ sal_Bool Sane::GetOptionValue( int n, sal_Bool& rRet )
return sal_True;
}
-sal_Bool Sane::GetOptionValue( int n, ByteString& rRet )
+sal_Bool Sane::GetOptionValue( int n, rtl::OString& rRet )
{
sal_Bool bSuccess = sal_False;
if( ! maHandle || mppOptions[n]->type != SANE_TYPE_STRING )
@@ -450,8 +450,8 @@ sal_Bool Sane::SetOptionValue( int n, const String& rSet )
{
if( ! maHandle || mppOptions[n]->type != SANE_TYPE_STRING )
return sal_False;
- ByteString aSet( rSet, gsl_getSystemTextEncoding() );
- SANE_Status nStatus = ControlOption( n, SANE_ACTION_SET_VALUE, (void*)aSet.GetBuffer() );
+ rtl::OString aSet(rtl::OUStringToOString(rSet, osl_getThreadTextEncoding()));
+ SANE_Status nStatus = ControlOption( n, SANE_ACTION_SET_VALUE, (void*)aSet.getStr() );
if( nStatus != SANE_STATUS_GOOD )
return sal_False;
return sal_True;
diff --git a/extensions/source/scanner/sane.hxx b/extensions/source/scanner/sane.hxx
index fe5a634..680a667 100644
--- a/extensions/source/scanner/sane.hxx
+++ b/extensions/source/scanner/sane.hxx
@@ -156,7 +156,7 @@ public:
inline int GetOptionElements( int n );
int GetOptionByName( const char* );
sal_Bool GetOptionValue( int, sal_Bool& );
- sal_Bool GetOptionValue( int, ByteString& );
+ sal_Bool GetOptionValue( int, rtl::OString& );
sal_Bool GetOptionValue( int, double&, int nElement = 0 );
sal_Bool GetOptionValue( int, double* );
diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx
index c83406f..5e9bfac 100644
--- a/extensions/source/scanner/sanedlg.cxx
+++ b/extensions/source/scanner/sanedlg.cxx
@@ -515,8 +515,9 @@ IMPL_LINK( SaneDlg, SelectHdl, ListBox*, pListBox )
{
if( pListBox == &maQuantumRangeBox )
{
- ByteString aValue( maQuantumRangeBox.GetSelectEntry(), osl_getThreadTextEncoding() );
- double fValue = atof( aValue.GetBuffer() );
+ rtl::OString aValue(rtl::OUStringToOString(maQuantumRangeBox.GetSelectEntry(),
+ osl_getThreadTextEncoding()));
+ double fValue = atof(aValue.getStr());
mrSane.SetOptionValue( mnCurrentOption, fValue, mnCurrentElement );
}
else if( pListBox == &maStringRangeBox )
@@ -533,7 +534,8 @@ IMPL_LINK( SaneDlg, OptionsBoxSelectHdl, SvTreeListBox*, pBox )
{
String aOption =
maOptionBox.GetEntryText( maOptionBox.FirstSelected() );
- int nOption = mrSane.GetOptionByName( ByteString( aOption, osl_getThreadTextEncoding() ).GetBuffer() );
+ int nOption = mrSane.GetOptionByName(rtl::OUStringToOString(aOption,
+ osl_getThreadTextEncoding()).getStr());
if( nOption != -1 && nOption != mnCurrentOption )
{
DisableOption();
@@ -636,8 +638,9 @@ IMPL_LINK( SaneDlg, ModifyHdl, Edit*, pEdit )
{
double fValue;
char pBuf[256];
- ByteString aContents( maNumericEdit.GetText(), osl_getThreadTextEncoding() );
- fValue = atof( aContents.GetBuffer() );
+ rtl::OString aContents(rtl::OUStringToOString(maNumericEdit.GetText(),
+ osl_getThreadTextEncoding()));
+ fValue = atof(aContents.getStr());
if( mfMin != mfMax && ( fValue < mfMin || fValue > mfMax ) )
{
if( fValue < mfMin )
@@ -825,7 +828,7 @@ void SaneDlg::EstablishBoolOption()
void SaneDlg::EstablishStringOption()
{
sal_Bool bSuccess;
- ByteString aValue;
+ rtl::OString aValue;
bSuccess = mrSane.GetOptionValue( mnCurrentOption, aValue );
if( bSuccess )
@@ -843,7 +846,7 @@ void SaneDlg::EstablishStringRange()
maStringRangeBox.Clear();
for( int i = 0; ppStrings[i] != 0; i++ )
maStringRangeBox.InsertEntry( String( ppStrings[i], osl_getThreadTextEncoding() ) );
- ByteString aValue;
+ rtl::OString aValue;
mrSane.GetOptionValue( mnCurrentOption, aValue );
maStringRangeBox.SelectEntry( String( aValue, osl_getThreadTextEncoding() ) );
maStringRangeBox.Show( sal_True );
@@ -1189,13 +1192,13 @@ sal_Bool SaneDlg::LoadState()
return sal_False;
aConfig.SetGroup( "SANE" );
- ByteString aString = aConfig.ReadKey( "SO_LastSaneDevice" );
- for( i = 0; i < Sane::CountDevices() && ! aString.Equals( ByteString( Sane::GetName( i ), osl_getThreadTextEncoding() ) ); i++ ) ;
+ rtl::OString aString = aConfig.ReadKey( "SO_LastSaneDevice" );
+ for( i = 0; i < Sane::CountDevices() && !aString.equals(rtl::OUStringToOString(Sane::GetName(i), osl_getThreadTextEncoding())); i++ ) ;
if( i == Sane::CountDevices() )
return sal_False;
mrSane.Close();
- mrSane.Open( aString.GetBuffer() );
+ mrSane.Open( aString.getStr() );
DisableOption();
InitFields();
@@ -1207,7 +1210,7 @@ sal_Bool SaneDlg::LoadState()
{
aString = aConfig.GetKeyName( i );
rtl::OString aValue = aConfig.ReadKey( i );
- int nOption = mrSane.GetOptionByName( aString.GetBuffer() );
+ int nOption = mrSane.GetOptionByName( aString.getStr() );
if( nOption == -1 )
continue;
@@ -1235,7 +1238,7 @@ sal_Bool SaneDlg::LoadState()
rtl::OString aSub = aValue.getToken(0, ':', nIndex);
double fValue=0.0;
sscanf(aSub.getStr(), "%lg", &fValue);
- SetAdjustedNumericalValue(aString.GetBuffer(), fValue, n++);
+ SetAdjustedNumericalValue(aString.getStr(), fValue, n++);
}
while ( nIndex >= 0 );
}
@@ -1260,7 +1263,8 @@ void SaneDlg::SaveState()
Config aConfig( aFileName );
aConfig.DeleteGroup( "SANE" );
aConfig.SetGroup( "SANE" );
- aConfig.WriteKey( "SO_LastSANEDevice", ByteString( maDeviceBox.GetSelectEntry(), RTL_TEXTENCODING_UTF8 ) );
+ aConfig.WriteKey( "SO_LastSANEDevice",
+ rtl::OUStringToOString(maDeviceBox.GetSelectEntry(), RTL_TEXTENCODING_UTF8) );
static char const* pSaveOptions[] = {
"resolution",
@@ -1269,9 +1273,9 @@ void SaneDlg::SaveState()
"br-x",
"br-y"
};
- for( size_t i = 0; i < SAL_N_ELEMENTS(pSaveOptions); i++ )
+ for( size_t i = 0; i < SAL_N_ELEMENTS(pSaveOptions); ++i )
{
- ByteString aOption = pSaveOptions[i];
+ rtl::OString aOption = pSaveOptions[i];
int nOption = mrSane.GetOptionByName( pSaveOptions[i] );
if( nOption > -1 )
{
@@ -1292,19 +1296,19 @@ void SaneDlg::SaveState()
break;
case SANE_TYPE_STRING:
{
- ByteString aString( "STRING=" );
- ByteString aValue;
+ rtl::OString aValue;
if( mrSane.GetOptionValue( nOption, aValue ) )
{
- aString += aValue;
- aConfig.WriteKey( aOption, aString );
+ rtl::OStringBuffer aString(RTL_CONSTASCII_STRINGPARAM("STRING="));
+ aString.append(aValue);
+ aConfig.WriteKey( aOption, aString.makeStringAndClear() );
}
}
break;
case SANE_TYPE_FIXED:
case SANE_TYPE_INT:
{
- ByteString aString( "NUMERIC=" );
+ rtl::OStringBuffer aString(RTL_CONSTASCII_STRINGPARAM("NUMERIC="));
double fValue;
char buf[256];
int n;
@@ -1314,12 +1318,12 @@ void SaneDlg::SaveState()
if( ! mrSane.GetOptionValue( nOption, fValue, n ) )
break;
if( n > 0 )
- aString += ":";
+ aString.append(':');
sprintf( buf, "%lg", fValue );
- aString += buf;
+ aString.append(buf);
}
if( n >= mrSane.GetOptionElements( nOption ) )
- aConfig.WriteKey( aOption, aString );
+ aConfig.WriteKey( aOption, aString.makeStringAndClear() );
}
break;
default:
commit 994a737a317165db736f2a2f6a25b3439207da5d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Nov 7 11:13:05 2011 +0000
callcatcher: update list
diff --git a/svtools/inc/svtools/ctrlbox.hxx b/svtools/inc/svtools/ctrlbox.hxx
index d346b3b..3ab9e31 100644
--- a/svtools/inc/svtools/ctrlbox.hxx
+++ b/svtools/inc/svtools/ctrlbox.hxx
@@ -589,7 +589,6 @@ public:
virtual void SetValue( sal_Int64 nNewValue );
virtual sal_Int64 GetValue( FieldUnit eOutUnit ) const;
virtual sal_Int64 GetValue() const;
- sal_Int64 GetValue( sal_uInt16 nPos, FieldUnit eOutUnit ) const;
void SetUserValue( sal_Int64 nNewValue, FieldUnit eInUnit );
void SetUserValue( sal_Int64 nNewValue ) { SetUserValue( nNewValue, FUNIT_NONE ); }
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index e602cef..4387aee 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -2010,27 +2010,6 @@ void FontSizeBox::SetValue( sal_Int64 nNewValue )
SetValue( nNewValue, FUNIT_NONE );
}
-// -----------------------------------------------------------------------
-
-sal_Int64 FontSizeBox::GetValue( sal_uInt16 nPos, FieldUnit eOutUnit ) const
-{
- if ( !bRelative )
- {
- sal_Int64 nComboVal = static_cast<sal_Int64>(reinterpret_cast<long>(ComboBox::GetEntryData( nPos )));
- if ( nComboVal < 0 ) // marked as special?
- {
- return MetricField::ConvertValue( -nComboVal, mnBaseValue, GetDecimalDigits(),
- meUnit, eOutUnit );
- }
- }
-
- // do normal font size processing
- sal_Int64 nRetValue = MetricBox::GetValue( nPos, eOutUnit );
- return nRetValue;
-}
-
-// -----------------------------------------------------------------------
-
sal_Int64 FontSizeBox::GetValue( FieldUnit eOutUnit ) const
{
if ( !bRelative )
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 972efd6..71faf9e 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -3199,71 +3199,6 @@ void FmXFormShell::stopFiltering(sal_Bool bSave)
}
//------------------------------------------------------------------------------
-void clearFilter(const Reference< runtime::XFormController >& _rxController)
-{
- Reference< XPropertySet> xControllerAsSet(_rxController, UNO_QUERY);
- Reference< XIndexAccess> xControllerAsIndex(_rxController, UNO_QUERY);
-
- // call the subcontroller
- Reference< runtime::XFormController > xController;
- for (sal_Int32 i = 0, nCount = xControllerAsIndex->getCount();
- i < nCount; i++)
- {
- xControllerAsIndex->getByIndex(i) >>= xController;
- clearFilter(xController);
- }
-
- // clear the filter
- Reference< XIndexContainer> xContainer;
- xControllerAsSet->getPropertyValue(FM_PROP_FILTERSUPPLIER) >>= xContainer;
- if (xContainer.is())
- {
- // clear the current filter
- Sequence< PropertyValue> aCondition;
-
- // as there is always an empty row, if we have a filter:
- if (xContainer->getCount())
- {
- xControllerAsSet->setPropertyValue(FM_PROP_CURRENTFILTER, makeAny(sal_Int32(xContainer->getCount() - 1)));
- while (xContainer->getCount() > 1)
- xContainer->removeByIndex(0);
- }
- }
-}
-
-//------------------------------------------------------------------------------
-void FmXFormShell::clearFilter()
-{
- if ( impl_checkDisposed() )
- return;
-
- FmXFormView* pXView = m_pShell->GetFormView()->GetImpl();
-
- // if the active controller is our external one we have to use the trigger controller
- Reference< XControlContainer> xContainer;
- if (getActiveController() == m_xExternalViewController)
- {
- DBG_ASSERT(m_xExtViewTriggerController.is(), "FmXFormShell::clearFilter : inconsistent : active external controller, but noone triggered this !");
- xContainer = m_xExtViewTriggerController->getContainer();
- }
- else
- xContainer = getActiveController()->getContainer();
-
- PFormViewPageWindowAdapter pAdapter = pXView->findWindow(xContainer);
- if ( pAdapter.is() )
- {
- const ::std::vector< Reference< runtime::XFormController > > & rControllerList = pAdapter->GetList();
- for ( ::std::vector< Reference< runtime::XFormController > > ::const_iterator j = rControllerList.begin();
- j != rControllerList.end();
- ++j
- )
- {
- ::clearFilter(*j);
- }
- }
-}
-
-//------------------------------------------------------------------------------
void FmXFormShell::CreateExternalView()
{
if ( impl_checkDisposed() )
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index 7e1b75c..b9f42ca 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -437,7 +437,6 @@ public:
sal_Bool isInFilterMode() const {return m_bFilterMode;}
void startFiltering();
void stopFiltering(sal_Bool bSave);
- void clearFilter();
static PopupMenu* GetConversionMenu();
// ein Menue, das alle ControlConversion-Eintraege enthaelt
diff --git a/unotools/inc/unotools/intlwrapper.hxx b/unotools/inc/unotools/intlwrapper.hxx
index d614a20..92aef9d 100644
--- a/unotools/inc/unotools/intlwrapper.hxx
+++ b/unotools/inc/unotools/intlwrapper.hxx
@@ -59,17 +59,13 @@ private:
::com::sun::star::lang::Locale aLocale;
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xSMgr;
- CharClass* pCharClass;
LocaleDataWrapper* pLocaleData;
- CalendarWrapper* pCalendar;
CollatorWrapper* pCollator;
CollatorWrapper* pCaseCollator;
LanguageType eLanguage;
- void ImplNewCharClass() const;
void ImplNewLocaleData() const;
- void ImplNewCalendar() const;
void ImplNewCollator( sal_Bool bCaseSensitive ) const;
@@ -87,24 +83,12 @@ public:
LanguageType getLanguage() const { return eLanguage; }
const ::com::sun::star::lang::Locale& getLocale() const { return aLocale; }
- const CharClass* getCharClass() const
- {
- if ( !pCharClass )
- ImplNewCharClass();
- return pCharClass;
- }
const LocaleDataWrapper* getLocaleData() const
{
if ( !pLocaleData )
ImplNewLocaleData();
return pLocaleData;
}
- CalendarWrapper* getCalendar() const
- {
- if ( !pCalendar )
- ImplNewCalendar();
- return pCalendar;
- }
/// case insensitive collator, simple IGNORE_CASE
const CollatorWrapper* getCollator() const
{
diff --git a/unotools/source/i18n/intlwrapper.cxx b/unotools/source/i18n/intlwrapper.cxx
index f98d682..61f86d8 100644
--- a/unotools/source/i18n/intlwrapper.cxx
+++ b/unotools/source/i18n/intlwrapper.cxx
@@ -39,9 +39,7 @@ IntlWrapper::IntlWrapper(
:
aLocale( rLocale ),
xSMgr( xSF ),
- pCharClass( NULL ),
pLocaleData( NULL ),
- pCalendar( NULL ),
pCollator( NULL ),
pCaseCollator( NULL )
{
@@ -54,9 +52,7 @@ IntlWrapper::IntlWrapper(
LanguageType eLang )
:
xSMgr( xSF ),
- pCharClass( NULL ),
pLocaleData( NULL ),
- pCalendar( NULL ),
pCollator( NULL ),
pCaseCollator( NULL ),
eLanguage( eLang )
@@ -67,34 +63,18 @@ IntlWrapper::IntlWrapper(
IntlWrapper::~IntlWrapper()
{
- delete pCharClass;
delete pLocaleData;
- delete pCalendar;
delete pCollator;
delete pCaseCollator;
}
-void IntlWrapper::ImplNewCharClass() const
-{
- ((IntlWrapper*)this)->pCharClass = new CharClass( xSMgr, aLocale );
-}
-
-
void IntlWrapper::ImplNewLocaleData() const
{
((IntlWrapper*)this)->pLocaleData = new LocaleDataWrapper( xSMgr, aLocale );
}
-void IntlWrapper::ImplNewCalendar() const
-{
- CalendarWrapper* p = new CalendarWrapper( xSMgr );
- p->loadDefaultCalendar( aLocale );
- ((IntlWrapper*)this)->pCalendar = p;
-}
-
-
void IntlWrapper::ImplNewCollator( sal_Bool bCaseSensitive ) const
{
CollatorWrapper* p = new CollatorWrapper( xSMgr );
diff --git a/unusedcode.easy b/unusedcode.easy
index e5b7d3c..058c9ce 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -129,10 +129,8 @@ FmFieldWinMgr::GetChildWindowId()
FmFormObj::getType() const
FmPropBrwMgr::GetChildWindowId()
FmXFilterCell::getImplementation(com::sun::star::uno::Reference<com::sun::star::awt::XControl> const&)
-FmXFormShell::clearFilter()
FontCharMap::GetLastChar() const
FontSelectPattern::FontSelectPattern(ImplFontData const&, Size const&, float, int, bool)
-FontSizeBox::GetValue(unsigned short, FieldUnit) const
FontSizeBox::SetUserValue(long, FieldUnit)
FontStyleBox::FontStyleBox(Window*, long)
FontStyleMenu::Fill(String const&, FontList const*)
@@ -198,8 +196,6 @@ InsCapOptArr::Insert(InsCaptionOpt* const&, unsigned short&)
InsCapOptArr::Insert(InsCaptionOpt* const*, unsigned short)
InsCapOptArr::Remove(InsCaptionOpt* const&, unsigned short)
InsCapOptArr::Remove(unsigned short, unsigned short)
-IntlWrapper::ImplNewCalendar() const
-IntlWrapper::ImplNewCharClass() const
IntroWindow::SetBackgroundBitmap(Bitmap const&)
ItemList::FindAttrib(unsigned short)
KeyCode::GetSymbolName(String const&, Window*) const
@@ -429,7 +425,7 @@ ScDPItemData::GetNumFormat() const
ScDPSaveData::Refresh(com::sun::star::uno::Reference<com::sun::star::sheet::XDimensionsSupplier> const&)
ScDdeLink::ResetValue()
ScDocRowHeightUpdater::TabRanges::TabRanges()
-ScDocument::ValidNewTabName(std::__debug::vector<String, std::allocator<String> > const&) const
+ScDocument::ValidNewTabName(std::__debug::vector<rtl::OUString, std::allocator<rtl::OUString> > const&) const
ScFilterDetect::impl_createFactory(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
ScFiltersTest::testPassword()
ScFormulaCell::IsRangeNameInUse(unsigned short) const
commit c9e9b3a36ffd2d2b37fbe7267b4707174e8c6312
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Nov 7 08:41:21 2011 +0000
callcatcher: update list, drop some newly unused methods
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index adf3c8e..3e2338a 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -885,9 +885,6 @@ public:
void EnterBlockNotifications();
void LeaveBlockNotifications();
-
- EditSelection MatchGroup( const EditSelection& rSel );
-
void UndoActionStart( sal_uInt16 nId );
void UndoActionStart( sal_uInt16 nId, const ESelection& rSel );
void UndoActionEnd( sal_uInt16 nId );
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index 74d096c..723cf02 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -3450,111 +3450,6 @@ EditSelection ImpEditEngine::ConvertSelection( sal_uInt16 nStartPara, sal_uInt16
return aNewSelection;
}
-EditSelection ImpEditEngine::MatchGroup( const EditSelection& rSel )
-{
- EditSelection aMatchSel;
- EditSelection aTmpSel( rSel );
- aTmpSel.Adjust( GetEditDoc() );
- if ( ( aTmpSel.Min().GetNode() != aTmpSel.Max().GetNode() ) ||
- ( ( aTmpSel.Max().GetIndex() - aTmpSel.Min().GetIndex() ) > 1 ) )
- {
- return aMatchSel;
- }
-
- sal_uInt16 nPos = aTmpSel.Min().GetIndex();
- ContentNode* pNode = aTmpSel.Min().GetNode();
- if ( nPos >= pNode->Len() )
- return aMatchSel;
-
- sal_uInt16 nMatchChar = aGroupChars.Search( pNode->GetChar( nPos ) );
- if ( nMatchChar != STRING_NOTFOUND )
- {
- sal_uInt16 nNode = aEditDoc.GetPos( pNode );
- if ( ( nMatchChar % 2 ) == 0 )
- {
- // Search forward...
- xub_Unicode nSC = aGroupChars.GetChar( nMatchChar );
- OSL_ENSURE( aGroupChars.Len() > (nMatchChar+1), "Invalid group of MatchChars!" );
- xub_Unicode nEC = aGroupChars.GetChar( nMatchChar+1 );
-
- sal_uInt16 nCur = aTmpSel.Min().GetIndex()+1;
- sal_uInt16 nLevel = 1;
- while ( pNode && nLevel )
- {
- XubString& rStr = *pNode;
- while ( nCur < rStr.Len() )
- {
- if ( rStr.GetChar( nCur ) == nSC )
- nLevel++;
- else if ( rStr.GetChar( nCur ) == nEC )
- {
- nLevel--;
- if ( !nLevel )
- break; // while nCur...
- }
- nCur++;
- }
-
- if ( nLevel )
- {
- nNode++;
- pNode = nNode < aEditDoc.Count() ? aEditDoc.GetObject( nNode ) : 0;
- nCur = 0;
- }
- }
- if ( nLevel == 0 ) // found
- {
- aMatchSel.Min() = aTmpSel.Min();
- aMatchSel.Max() = EditPaM( pNode, nCur+1 );
- }
- }
- else
- {
- // Search backwards...
- xub_Unicode nEC = aGroupChars.GetChar( nMatchChar );
- xub_Unicode nSC = aGroupChars.GetChar( nMatchChar-1 );
-
- sal_uInt16 nCur = aTmpSel.Min().GetIndex()-1;
- sal_uInt16 nLevel = 1;
- while ( pNode && nLevel )
- {
- if ( pNode->Len() )
- {
- XubString& rStr = *pNode;
- while ( nCur )
- {
- if ( rStr.GetChar( nCur ) == nSC )
- {
- nLevel--;
- if ( !nLevel )
- break; // while nCur...
- }
- else if ( rStr.GetChar( nCur ) == nEC )
- nLevel++;
-
- nCur--;
- }
- }
-
- if ( nLevel )
- {
- pNode = nNode ? aEditDoc.GetObject( --nNode ) : 0;
- if ( pNode )
- nCur = pNode->Len()-1; // no matter if negative, because if Len ()
- }
- }
-
- if ( nLevel == 0 ) // found
- {
- aMatchSel.Min() = aTmpSel.Min();
- aMatchSel.Min().GetIndex()++; // after the character
- aMatchSel.Max() = EditPaM( pNode, nCur );
- }
- }
- }
- return aMatchSel;
-}
-
void ImpEditEngine::SetActiveView( EditView* pView )
{
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx
index 15d5b92..0904871 100644
--- a/sc/inc/externalrefmgr.hxx
+++ b/sc/inc/externalrefmgr.hxx
@@ -277,12 +277,6 @@ public:
void setAllCacheTableReferencedStati( bool bReferenced );
bool areAllCacheTablesReferenced() const;
- /**
- * Set a table as permanently referenced, to be called if not in
- * mark-during-store-to-file cycle.
- */
- void setCacheTableReferencedPermanently( sal_uInt16 nFileId, const ::rtl::OUString& rTabName, size_t nSheets );
-
private:
struct ReferencedStatus
{
diff --git a/sc/inc/pivot.hxx b/sc/inc/pivot.hxx
index 01bb7be..705f794 100644
--- a/sc/inc/pivot.hxx
+++ b/sc/inc/pivot.hxx
@@ -110,7 +110,6 @@ struct ScPivotParam
ScPivotParam& operator= ( const ScPivotParam& r );
bool operator== ( const ScPivotParam& r ) const;
- void ClearPivotArrays();
void SetLabelData (const ::std::vector<ScDPLabelDataRef>& r);
};
diff --git a/sc/inc/queryentry.hxx b/sc/inc/queryentry.hxx
index 463618e..48f7637 100644
--- a/sc/inc/queryentry.hxx
+++ b/sc/inc/queryentry.hxx
@@ -65,7 +65,6 @@ struct ScQueryEntry
bool IsQueryStringEmpty() const;
bool MatchByString(const rtl::OUString& rStr, bool bCaseSens) const;
- void SwapQueryStrings(QueryStringsType& rStrings);
void SortQueryStrings(bool bCaseSens);
SC_DLLPUBLIC void SetQueryString(const rtl::OUString& rStr);
SC_DLLPUBLIC rtl::OUString GetQueryString() const;
diff --git a/sc/source/core/data/pivot2.cxx b/sc/source/core/data/pivot2.cxx
index 68033dc..d69efe6 100644
--- a/sc/source/core/data/pivot2.cxx
+++ b/sc/source/core/data/pivot2.cxx
@@ -148,14 +148,6 @@ ScPivotParam::~ScPivotParam()
{
}
-void ScPivotParam::ClearPivotArrays()
-{
- maPageFields.clear();
- maColFields.clear();
- maRowFields.clear();
- maDataFields.clear();
-}
-
void ScPivotParam::SetLabelData(const vector<ScDPLabelDataRef>& r)
{
vector<ScDPLabelDataRef> aNewArray;
diff --git a/sc/source/core/tool/queryentry.cxx b/sc/source/core/tool/queryentry.cxx
index c69354b..641bcd0 100644
--- a/sc/source/core/tool/queryentry.cxx
+++ b/sc/source/core/tool/queryentry.cxx
@@ -122,11 +122,6 @@ bool ScQueryEntry::MatchByString(const rtl::OUString& rStr, bool bCaseSens) cons
return pTransliteration->isEqual(rStr, *itr);
}
-void ScQueryEntry::SwapQueryStrings(QueryStringsType& rStrings)
-{
- maQueryStrings.swap(rStrings);
-}
-
void ScQueryEntry::SortQueryStrings(bool bCaseSens)
{
std::sort(maQueryStrings.begin(), maQueryStrings.end(), CompareString(bCaseSens));
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx
index 6f6e64e..cf3c561 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -1011,26 +1011,6 @@ bool ScExternalRefCache::setCacheTableReferenced( sal_uInt16 nFileId, const OUSt
return areAllCacheTablesReferenced();
}
-void ScExternalRefCache::setCacheTableReferencedPermanently( sal_uInt16 nFileId, const OUString& rTabName, size_t nSheets )
-{
- DocItem* pDoc = getDocItem(nFileId);
- if (pDoc)
- {
- size_t nIndex = 0;
- String aTabNameUpper = ScGlobal::pCharClass->upper( rTabName);
- if (lcl_getTableDataIndex( pDoc->maTableNameIndex, aTabNameUpper, nIndex))
- {
- size_t nStop = ::std::min( nIndex + nSheets, pDoc->maTables.size());
- for (size_t i = nIndex; i < nStop; ++i)
- {
- TableTypeRef pTab = pDoc->maTables[i];
- if (pTab.get())
- pTab->setReferencedFlag( Table::REFERENCED_PERMANENT);
- }
- }
- }
-}
-
void ScExternalRefCache::setAllCacheTableReferencedStati( bool bReferenced )
{
if (bReferenced)
diff --git a/unusedcode.easy b/unusedcode.easy
index 155724a..e5b7d3c 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -7,9 +7,6 @@ AtomPubSession::~AtomPubSession()
BufferNode::childAt(int) const
ByteString::Assign(char const*, unsigned short)
ByteString::Assign(char)
-CAT::Apply(float*, float const*) const
-CAT::Inverse() const
-CAT::makeChromaticAdaptationTag() const
CIccCLUT::Interp3dTetra(float*, float const*)
CIccCLUT::Iterate(IIccCLUTExec*)
CIccFormulaCurveSegment::SetFunction(unsigned short, unsigned char, float*)
@@ -357,7 +354,6 @@ SbiIoSystem::NextChannel()
SbiRuntime::GetParams()
SbiSymPool::Clear()
SbxAlias::SbxAlias(String const&, SbxVariable*)
-SbxBase::StaticEnableBroadcasting(unsigned char)
SbxDecimal::SbxDecimal()
SbxDecimal::getByte(unsigned char&)
SbxDecimal::getChar(unsigned short&)
@@ -436,6 +432,7 @@ ScDocRowHeightUpdater::TabRanges::TabRanges()
ScDocument::ValidNewTabName(std::__debug::vector<String, std::allocator<String> > const&) const
ScFilterDetect::impl_createFactory(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
ScFiltersTest::testPassword()
+ScFormulaCell::IsRangeNameInUse(unsigned short) const
ScFormulaCell::ScFormulaCell()
ScHTMLColOffset::Insert(ScHTMLColOffset const*, unsigned short, unsigned short)
ScHTMLColOffset::Insert(unsigned long const&, unsigned short&)
@@ -458,7 +455,6 @@ ScNameDlg::CalcCurTableAssign(String&, ScRangeData*)
ScNamedRangeObj::SetContentWithGrammar(rtl::OUString const&, formula::FormulaGrammar::Grammar)
ScNamedRangeObj::getImplementation(com::sun::star::uno::Reference<com::sun::star::uno::XInterface>)
ScOutputData::DrawEditParam::getEngineWidth(ScFieldEditEngine*) const
-ScPivotParam::ClearPivotArrays()
ScRTFColTwips::Insert(ScRTFColTwips const*, unsigned short, unsigned short)
ScRTFColTwips::Insert(unsigned long const&, unsigned short&)
ScRTFColTwips::Insert(unsigned long const*, unsigned short)
@@ -481,6 +477,7 @@ ScTpCalcOptions::GetRanges()
ScTpPrintOptions::GetRanges()
ScTpSubTotalGroup::GetRanges()
ScTpUserLists::GetRanges()
+ScUndoAllRangeNames::ScUndoAllRangeNames(ScDocShell*, ScRangeName const*, ScRangeName const*, std::__debug::map<short, ScRangeName const*, std::less<short>, std::allocator<std::pair<short const, ScRangeName const*> > > const&, std::__debug::map<short, ScRangeName const*, std::less<short>, std::allocator<std::pair<short const, ScRangeName const*> > > const&)
ScUserList::end()
ScUserList::end() const
ScValidationEntries_Impl::Insert(ScValidationData* const&, unsigned short&)
commit 75871d9a8c0f22f3d5486023a56175d0d04e66d5
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Nov 6 23:09:41 2011 +0000
callcatcher: remove some unused methods
diff --git a/editeng/inc/editeng/editview.hxx b/editeng/inc/editeng/editview.hxx
index 31f0824..887439e 100644
--- a/editeng/inc/editeng/editview.hxx
+++ b/editeng/inc/editeng/editview.hxx
@@ -192,8 +192,6 @@ public:
void SetAnchorMode( EVAnchorMode eMode );
EVAnchorMode GetAnchorMode() const;
- sal_Bool MatchGroup();
-
void CompleteAutoCorrect( Window* pFrameWin = NULL );
EESpellState StartSpeller( sal_Bool bMultipleDoc = sal_False );
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index 919e40f..c947386 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -819,23 +819,6 @@ void EditView::TransliterateText( sal_Int32 nTransliterationMode )
}
}
-
-sal_Bool EditView::MatchGroup()
-{
- DBG_CHKTHIS( EditView, 0 );
- DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
- EditSelection aNewSel( PIMPEE->MatchGroup( pImpEditView->GetEditSelection() ) );
- if ( aNewSel.HasRange() )
- {
- pImpEditView->DrawSelection();
- pImpEditView->SetEditSelection( aNewSel );
- pImpEditView->DrawSelection();
- ShowCursor();
- return sal_True;
- }
- return sal_False;
-}
-
void EditView::CompleteAutoCorrect( Window* pFrameWin )
{
DBG_CHKTHIS( EditView, 0 );
diff --git a/sc/source/filter/excel/xipivot.cxx b/sc/source/filter/excel/xipivot.cxx
index 34b1c0c..6eb9ee9 100644
--- a/sc/source/filter/excel/xipivot.cxx
+++ b/sc/source/filter/excel/xipivot.cxx
@@ -907,11 +907,6 @@ const String* XclImpPTItem::GetItemName() const
return 0;
}
-const String* XclImpPTItem::GetVisItemName() const
-{
- return maItemInfo.HasVisName() ? maItemInfo.GetVisName() : GetItemName();
-}
-
void XclImpPTItem::ReadSxvi( XclImpStream& rStrm )
{
rStrm >> maItemInfo;
diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx
index 49d1b19..2ea78a3 100644
--- a/sc/source/filter/excel/xistyle.cxx
+++ b/sc/source/filter/excel/xistyle.cxx
@@ -157,19 +157,6 @@ ColorData XclImpPalette::GetColorData( sal_uInt16 nXclIndex ) const
return GetDefColorData( nXclIndex );
}
-::com::sun::star::uno::Sequence< sal_Int32 > XclImpPalette::CreateColorSequence() const
-{
- sal_Int32 nCount = static_cast< sal_Int32 >( maColorTable.size() );
- ::com::sun::star::uno::Sequence< sal_Int32 > aSeq( nCount );
- if( nCount > 0 )
- {
- sal_Int32* pnSeqColor = aSeq.getArray();
- for( ColorDataVec::const_iterator aIt = maColorTable.begin(), aEnd = maColorTable.end(); aIt != aEnd; ++aIt, ++pnSeqColor )
- *pnSeqColor = static_cast< sal_Int32 >( *aIt );
- }
- return aSeq;
-}
-
void XclImpPalette::ReadPalette( XclImpStream& rStrm )
{
sal_uInt16 nCount;
diff --git a/sc/source/filter/inc/xipivot.hxx b/sc/source/filter/inc/xipivot.hxx
index 8a8e6b7..ee5d03b 100644
--- a/sc/source/filter/inc/xipivot.hxx
+++ b/sc/source/filter/inc/xipivot.hxx
@@ -225,8 +225,6 @@ public:
/** Returns the internal name of the item or 0, if no name could be found. */
const String* GetItemName() const;
- /** Returns the displayed name of the item or 0, if no name could be found. */
- const String* GetVisItemName() const;
/** Reads an SXVI record containing data of this item. */
void ReadSxvi( XclImpStream& rStrm );
diff --git a/sc/source/filter/inc/xistyle.hxx b/sc/source/filter/inc/xistyle.hxx
index 5c74d82..eb31e44 100644
--- a/sc/source/filter/inc/xistyle.hxx
+++ b/sc/source/filter/inc/xistyle.hxx
@@ -69,9 +69,6 @@ public:
@return The color from current or default palette or COL_AUTO, if nothing else found. */
inline Color GetColor( sal_uInt16 nXclIndex ) const
{ return Color( GetColorData( nXclIndex ) ); }
- /** Returns the palette colors as UNO sequence. */
- ::com::sun::star::uno::Sequence< sal_Int32 >
- CreateColorSequence() const;
/** Reads a PALETTE record. */
void ReadPalette( XclImpStream& rStrm );
diff --git a/svx/inc/svx/svdobj.hxx b/svx/inc/svx/svdobj.hxx
index 4cdf86c..fba48bf 100644
--- a/svx/inc/svx/svdobj.hxx
+++ b/svx/inc/svx/svdobj.hxx
@@ -507,9 +507,6 @@ private:
static SdrItemPool* mpGlobalItemPool;
public:
static SdrItemPool& GetGlobalDrawObjectItemPool();
-private:
- SVX_DLLPRIVATE static void FreeGlobalDrawObjectItemPool();
-
protected:
void ImpDeleteUserData();
SdrObjUserData* ImpGetMacroUserData() const;
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 99a877a..e91ec3e 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -526,17 +526,6 @@ SdrItemPool& SdrObject::GetGlobalDrawObjectItemPool()
return *mpGlobalItemPool;
}
-void SdrObject::FreeGlobalDrawObjectItemPool()
-{
- // code for deletion of GlobalItemPool
- if(mpGlobalItemPool)
- {
- SfxItemPool* pGlobalOutlPool = mpGlobalItemPool->GetSecondaryPool();
- SfxItemPool::Free(mpGlobalItemPool);
- SfxItemPool::Free(pGlobalOutlPool);
- }
-}
-
SdrItemPool* SdrObject::GetObjectItemPool() const
{
if(pModel)
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 656b0b7..6a03eb5 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -680,7 +680,7 @@ private:
// Our own 'IdleTimer' calls the following method
DECL_LINK( DoIdleJobs, Timer * );
// CharTimer calls this method.
- DECL_LINK( DoUpdateAllCharts, Timer * );
+ void DoUpdateAllCharts();
DECL_LINK( DoUpdateModifiedOLE, Timer * );
SwFmt *_MakeCharFmt(const String &, SwFmt *, sal_Bool, sal_Bool );
@@ -1679,7 +1679,7 @@ public:
void UpdateCharts( const String &rName ) const;
// Update all charts, for that exists any table.
- void UpdateAllCharts() { DoUpdateAllCharts( 0 ); }
+ void UpdateAllCharts() { DoUpdateAllCharts(); }
// Table is renamed and refreshes charts.
void SetTableName( SwFrmFmt& rTblFmt, const String &rNewName );
diff --git a/sw/source/core/doc/docchart.cxx b/sw/source/core/doc/docchart.cxx
index 09ce981..6be1b50 100644
--- a/sw/source/core/doc/docchart.cxx
+++ b/sw/source/core/doc/docchart.cxx
@@ -106,9 +106,7 @@ sal_Bool SwTable::IsTblComplexForChart( const String& rSelection,
*pEndBox->GetSttNd(), pGetCLines );
}
-
-
-IMPL_LINK( SwDoc, DoUpdateAllCharts, Timer *, EMPTYARG )
+void SwDoc::DoUpdateAllCharts()
{
ViewShell* pVSh;
GetEditShell( &pVSh );
@@ -129,7 +127,6 @@ IMPL_LINK( SwDoc, DoUpdateAllCharts, Timer *, EMPTYARG )
}
}
}
- return 0;
}
void SwDoc::_UpdateCharts( const SwTable& rTbl, ViewShell& rVSh ) const
diff --git a/sw/source/core/inc/pagefrm.hxx b/sw/source/core/inc/pagefrm.hxx
index 0550c0a..1e16a98 100644
--- a/sw/source/core/inc/pagefrm.hxx
+++ b/sw/source/core/inc/pagefrm.hxx
@@ -120,22 +120,6 @@ class SwPageFrm: public SwFtnBossFrm
bool bPaintRightShadow,
bool bRightSidebar );
- /** adds the sidebar used for notes to right and left border
- #i6193#
-
- @param aRect
- input parameter - current rect, we change borders if we want a sidebar
-
- @param _pViewShell
- input parameter - instance of the view shell, for which the rectangle
- has to be generated.
-
- @param bPx
- input parameter - if set to true, we add in pixel
- */
- static void AddSidebarBorders( Rectangle& aRect, ViewShell* _pViewShell, bool bRight, bool bPx = false);
- static void AddSidebarBorders( SwRect& aRect, ViewShell* _pViewShell, bool bRight, bool bPx = false);
-
protected:
virtual void MakeAll();
virtual void Modify( const SfxPoolItem*, const SfxPoolItem* );
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 0a452e4..8985a9b 100755
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -5788,30 +5788,6 @@ SwRect SwPageFrm::GetBoundRect() const
return aResult;
}
-/*static*/ void SwPageFrm::AddSidebarBorders(SwRect &aRect, ViewShell* _pViewShell, bool bRightSidebar, bool bPx)
-{
- const SwPostItMgr *pMgr = _pViewShell ? _pViewShell->GetPostItMgr() : 0;
- if (pMgr && pMgr->ShowNotes() && pMgr->HasNotes())
- {
- if (!bRightSidebar)
- aRect.SetLeftAndWidth(aRect.Left() - pMgr->GetSidebarWidth(bPx) - pMgr->GetSidebarBorderWidth(bPx), aRect.Width() + pMgr->GetSidebarWidth(bPx) + pMgr->GetSidebarBorderWidth(bPx));
- else
- aRect.AddRight(pMgr->GetSidebarWidth(bPx) + pMgr->GetSidebarBorderWidth(bPx));
- }
-}
-
-/*static*/ void SwPageFrm::AddSidebarBorders(Rectangle &aRect, ViewShell* _pViewShell, bool bRightSidebar, bool bPx)
-{
- const SwPostItMgr *pMgr = _pViewShell ? _pViewShell->GetPostItMgr() : 0;
- if (pMgr && pMgr->ShowNotes() && pMgr->HasNotes())
- {
- if (!bRightSidebar)
- aRect.Left() -= (pMgr->GetSidebarWidth(bPx) + pMgr->GetSidebarBorderWidth(bPx));
- else
- aRect.Right() += pMgr->GetSidebarWidth(bPx) + pMgr->GetSidebarBorderWidth(bPx);
- }
-}
-
/*static*/ SwTwips SwPageFrm::GetSidebarBorderWidth( const ViewShell* _pViewShell )
{
const SwPostItMgr* pPostItMgr = _pViewShell ? _pViewShell->GetPostItMgr() : 0;
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index 74dfbc5..c95cf60 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -332,14 +332,6 @@ IMPL_LINK(SwLoadOptPage, MetricHdl, ListBox*, EMPTYARG)
return 0;
}
-IMPL_LINK(SwLoadOptPage, CaptionHdl, PushButton*, EMPTYARG)
-{
- SwCaptionOptDlg aDlg(this, GetItemSet());
- aDlg.Execute();
-
- return 0;
-}
-
SwCaptionOptDlg::SwCaptionOptDlg(Window* pParent, const SfxItemSet& rSet) :
SfxSingleTabDialog(pParent, rSet, 0)
{
diff --git a/sw/source/ui/inc/optload.hxx b/sw/source/ui/inc/optload.hxx
index 1c5d0bd..490e0f4 100644
--- a/sw/source/ui/inc/optload.hxx
+++ b/sw/source/ui/inc/optload.hxx
@@ -70,7 +70,6 @@ private:
sal_uInt16 nLastTab;
sal_Int32 nOldLinkMode;
- DECL_LINK(CaptionHdl, PushButton*);
DECL_LINK(MetricHdl, ListBox*);
public:
diff --git a/unusedcode.easy b/unusedcode.easy
index 50f9025..155724a 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -108,7 +108,6 @@ EECharAttribArray::Replace(EECharAttrib const&, unsigned short)
EECharAttribArray::Replace(EECharAttrib const*, unsigned short, unsigned short)
EECharAttribArray::_ForEach(unsigned short, unsigned short, unsigned char (*)(EECharAttrib const&, void*), void*)
EditView::GetSelectionMode() const
-EditView::MatchGroup()
EditView::SetCursor(Cursor const&)
EditView::SetParaAttribs(SfxItemSet const&, unsigned short)
EditView::SetPointer(Pointer const&)
@@ -554,7 +553,6 @@ SdrModel::HasTransparentObjects(bool) const
SdrModel::IsAllowShapePropertyChangeListener() const
SdrObjFactory::MakeNewObjUserData(unsigned int, unsigned short, SdrObject*)
SdrObject::ClearObjectItem(unsigned short)
-SdrObject::FreeGlobalDrawObjectItemPool()
SdrOle2Obj::SdrOle2Obj(svt::EmbeddedObjectRef const&, String const&, bool)
SdrOle2Obj::SdrOle2Obj(svt::EmbeddedObjectRef const&, bool)
SdrPage::AddComment(sdr::Comment const&)
@@ -1064,7 +1062,6 @@ SwDestroyList::Insert(SwDestroyList const*, unsigned short, unsigned short)
SwDestroyList::Insert(SwSectionFrm* const&, unsigned short&)
SwDestroyList::Insert(SwSectionFrm* const*, unsigned short)
SwDestroyList::Remove(SwSectionFrm* const&, unsigned short)
-SwDoc::LinkStubDoUpdateAllCharts(void*, void*)
SwFilterDetect::impl_createFactory(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
SwFldDataOnlyDlgWrapper::GetChildWindowId()
SwFrameControlsManager::GetControls(FrameControlType)
@@ -1090,7 +1087,6 @@ SwLRects::Insert(SwLRects const*, unsigned short, unsigned short, unsigned short
SwLRects::Replace(SwLineRect const&, unsigned short)
SwLRects::Replace(SwLineRect const*, unsigned short, unsigned short)
SwLRects::_ForEach(unsigned short, unsigned short, unsigned char (*)(SwLineRect const&, void*), void*)
-SwLoadOptPage::LinkStubCaptionHdl(void*, void*)
SwMailMergeChildWindow::GetChildWindowId()
SwModify::GetClientCount() const
SwOutlineNodes::Insert(SwNode* const&, unsigned short&)
@@ -1098,8 +1094,6 @@ SwOutlineNodes::Insert(SwNode* const*, unsigned short)
SwOutlineNodes::Insert(SwOutlineNodes const*, unsigned short, unsigned short)
SwPaM::LessThan(SwPaM const&, SwPaM const&)
SwPaM::Overlap(SwPaM const&, SwPaM const&)
-SwPageFrm::AddSidebarBorders(Rectangle&, ViewShell*, bool, bool)
-SwPageFrm::AddSidebarBorders(SwRect&, ViewShell*, bool, bool)
SwPosFlyFrms::DeleteAndDestroy(unsigned short, unsigned short)
SwPosFlyFrms::Insert(SwPosFlyFrm* const&, unsigned short&)
SwPosFlyFrms::Insert(SwPosFlyFrm* const*, unsigned short)
@@ -1312,8 +1306,6 @@ XclExpFontBuffer::Insert(ScPatternAttr const&, short, XclExpColorType, bool)
XclExpName::IsHidden() const
XclExpPivotCache::GetFieldAcc(String const&)
XclExpString::SetFormats(std::__debug::vector<XclFormatRun, std::allocator<XclFormatRun> > const&)
-XclImpPTItem::GetVisItemName() const
-XclImpPalette::CreateColorSequence() const
XclObjId::XclObjId()
XclObjId::XclObjId(short, unsigned short)
XclRoot::GetDatabaseRanges() const
commit b2fe416ef61347b9e26691b745574519947cf796
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Nov 6 23:07:45 2011 +0000
don't seem to need CAT.obj
diff --git a/icc/SampleICC-makefiles.patch b/icc/SampleICC-makefiles.patch
index 8b2781c..34a59ff 100644
--- a/icc/SampleICC-makefiles.patch
+++ b/icc/SampleICC-makefiles.patch
@@ -50,7 +50,7 @@
+
--- /dev/null 2011-10-28 11:24:51.341910850 +0100
+++ misc/build/SampleICC-1.3.2/Contrib/ICC_utils/makefile.mk 2011-11-04 08:50:20.000000000 +0000
-@@ -0,0 +1,57 @@
+@@ -0,0 +1,56 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -99,7 +99,6 @@
+# --- Files --------------------------------------------------------
+
+SLOFILES=\
-+ $(SLO)$/CAT.obj \
+ $(SLO)$/ICC_tool_exception.obj \
+ $(SLO)$/Stubs.obj \
+ $(SLO)$/Vetters.obj
More information about the Libreoffice-commits
mailing list