[Libreoffice-commits] .: 4 commits - basic/inc basic/source comphelper/inc comphelper/source connectivity/source cppu/source i18nutil/prj i18nutil/source sc/inc sc/source svl/inc svx/inc svx/source toolkit/inc toolkit/source unusedcode.easy
Caolán McNamara
caolan at kemper.freedesktop.org
Fri Jun 15 07:42:01 PDT 2012
basic/inc/basic/basmgr.hxx | 2
basic/source/basmgr/basmgr.cxx | 16 ------
comphelper/inc/comphelper/property.hxx | 13 -----
comphelper/source/property/property.cxx | 19 -------
connectivity/source/drivers/file/FStatement.cxx | 14 -----
connectivity/source/inc/file/FStatement.hxx | 1
connectivity/source/inc/sqlscan.hxx | 1
connectivity/source/parse/sqlflex.l | 1
cppu/source/uno/data.cxx | 23 +++++++--
i18nutil/prj/build.lst | 2
i18nutil/source/utility/paper.cxx | 59 ++----------------------
sc/inc/cell.hxx | 3 -
sc/inc/column.hxx | 1
sc/inc/document.hxx | 1
sc/inc/nameuno.hxx | 2
sc/inc/rangenam.hxx | 2
sc/inc/table.hxx | 2
sc/inc/typedstrdata.hxx | 1
sc/source/core/data/cell.cxx | 6 --
sc/source/core/data/cell2.cxx | 20 --------
sc/source/core/data/column.cxx | 18 -------
sc/source/core/data/documen4.cxx | 6 --
sc/source/core/data/table1.cxx | 10 ----
sc/source/core/tool/typedstrdata.cxx | 5 --
sc/source/ui/condformat/colorformat.cxx | 49 -------------------
sc/source/ui/condformat/condformatdlg.cxx | 14 -----
sc/source/ui/dbgui/csvcontrol.cxx | 8 ---
sc/source/ui/inc/colorformat.hxx | 1
sc/source/ui/inc/condformatdlg.hxx | 1
sc/source/ui/inc/csvcontrol.hxx | 1
sc/source/ui/inc/viewfunc.hxx | 1
sc/source/ui/unoobj/nameuno.cxx | 9 ---
sc/source/ui/vba/vbafoundfiles.cxx | 12 ----
sc/source/ui/vba/vbafoundfiles.hxx | 3 -
sc/source/ui/view/viewfun2.cxx | 13 -----
svl/inc/svl/itemset.hxx | 13 -----
svx/inc/svx/sdr/attribute/sdrtextattribute.hxx | 1
svx/source/sdr/attribute/sdrtextattribute.cxx | 5 --
toolkit/inc/toolkit/helper/vclunohelper.hxx | 4 -
toolkit/source/helper/vclunohelper.cxx | 6 --
unusedcode.easy | 23 +--------
41 files changed, 31 insertions(+), 361 deletions(-)
New commits:
commit 9bf2d51927c3ac87b32b996a65bd30618b4ce58c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jun 14 23:43:35 2012 +0100
callcatcher: chainsaw out some unnecessary code
Change-Id: I88de7a942fbc9e0c51a3261236f5203f037d2392
diff --git a/basic/inc/basic/basmgr.hxx b/basic/inc/basic/basmgr.hxx
index d7b1c3f..6a689cd 100644
--- a/basic/inc/basic/basmgr.hxx
+++ b/basic/inc/basic/basmgr.hxx
@@ -133,7 +133,6 @@ private:
String aName;
String maStorageName;
- sal_Bool bBasMgrModified;
sal_Bool mbDocMgr;
BasicManagerImpl* mpImpl;
@@ -197,7 +196,6 @@ public:
sal_Bool RemoveLib( sal_uInt16 nLib, sal_Bool bDelBasicFromStorage );
// Modify-Flag will be reset only during save.
- sal_Bool IsModified() const;
sal_Bool IsBasicModified() const;
std::vector<BasicError>& GetErrors();
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index 7fc19ed..f5ca16c 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -685,8 +685,6 @@ BasicManager::BasicManager( SotStorage& rStorage, const String& rBaseURL, StarBA
if ( rStorage.IsStream( String::CreateFromAscii(szOldManagerStream) ) )
LoadOldBasicManager( rStorage );
}
-
- bBasMgrModified = sal_False;
}
void copyToLibraryContainer( StarBASIC* pBasic, const LibraryContainerInfo& rInfo )
@@ -824,7 +822,6 @@ BasicManager::BasicManager( StarBASIC* pSLib, String* pLibPath, sal_Bool bDocMgr
// Save is only necessary if basic has changed
xStdLib->SetModified( sal_False );
- bBasMgrModified = sal_False;
}
void BasicManager::ImpMgrNotLoaded( const String& rStorageName )
@@ -1063,7 +1060,6 @@ void BasicManager::Init()
{
DBG_CHKTHIS( BasicManager, 0 );
- bBasMgrModified = sal_False;
pLibs = new BasicLibs;
mpImpl = new BasicManagerImpl();
}
@@ -1293,7 +1289,6 @@ StarBASIC* BasicManager::AddLib( SotStorage& rStorage, const String& rLibName, s
pLibInfo->GetLib()->SetModified( sal_True ); // Must be saved after Add!
pLibInfo->SetStorageName( String::CreateFromAscii(szImbedded) ); // Save in BasicManager-Storage
}
- bBasMgrModified = sal_True;
}
else
{
@@ -1391,7 +1386,6 @@ sal_Bool BasicManager::RemoveLib( sal_uInt16 nLib, sal_Bool bDelBasicFromStorage
}
}
}
- bBasMgrModified = sal_True;
if ( pLibInfo->GetLib().Is() )
GetStdLib()->Remove( pLibInfo->GetLib() );
delete pLibs->Remove( pLibInfo );
@@ -1481,7 +1475,6 @@ sal_Bool BasicManager::SetLibName( sal_uInt16 nLib, const String& rName )
xStdLib->SetName( rName );
xStdLib->SetModified( sal_True );
}
- bBasMgrModified = sal_True;
return sal_True;
}
return sal_False;
@@ -1616,15 +1609,6 @@ BasicLibInfo* BasicManager::FindLibInfo( StarBASIC* pBasic ) const
}
-sal_Bool BasicManager::IsModified() const
-{
- DBG_CHKTHIS( BasicManager, 0 );
-
- if ( bBasMgrModified )
- return sal_True;
- return IsBasicModified();
-}
-
sal_Bool BasicManager::IsBasicModified() const
{
DBG_CHKTHIS( BasicManager, 0 );
diff --git a/comphelper/inc/comphelper/property.hxx b/comphelper/inc/comphelper/property.hxx
index a294b33..610ebfc 100644
--- a/comphelper/inc/comphelper/property.hxx
+++ b/comphelper/inc/comphelper/property.hxx
@@ -88,19 +88,6 @@ namespace comphelper
};
//------------------------------------------------------------------
-/** find property with given name
-
- @param o_rProp
- Output parameter receiving the property, if found
-
- @param i_rPropName
- Name of the property to find
-
- @return false, if property was not found
- */
-COMPHELPER_DLLPUBLIC bool findProperty(starbeans::Property& o_rProp, staruno::Sequence<starbeans::Property>& i_seqProps, const ::rtl::OUString& i_rPropName);
-
-//------------------------------------------------------------------
/// remove the property with the given name from the given sequence
COMPHELPER_DLLPUBLIC void RemoveProperty(staruno::Sequence<starbeans::Property>& seqProps, const ::rtl::OUString& _rPropName);
diff --git a/comphelper/source/property/property.cxx b/comphelper/source/property/property.cxx
index 04a1aca..34af9e5 100644
--- a/comphelper/source/property/property.cxx
+++ b/comphelper/source/property/property.cxx
@@ -151,25 +151,6 @@ sal_Bool hasProperty(const rtl::OUString& _rName, const Reference<XPropertySet>&
}
//------------------------------------------------------------------
-bool findProperty(Property& o_rProp,
- Sequence<Property>& i_seqProps,
- const ::rtl::OUString& i_rPropName)
-{
- const Property* pAry(i_seqProps.getConstArray());
- const sal_Int32 nLen(i_seqProps.getLength());
- const Property* pRes(
- std::find_if(pAry,pAry+nLen,
- boost::bind(PropertyStringEqualFunctor(),
- _1,
- boost::cref(i_rPropName))));
- if( pRes == pAry+nLen )
- return false;
-
- o_rProp = *pRes;
- return true;
-}
-
-//------------------------------------------------------------------
void RemoveProperty(Sequence<Property>& _rProps, const rtl::OUString& _rPropName)
{
sal_Int32 nLen = _rProps.getLength();
diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx
index cd178c8..8581d04 100644
--- a/connectivity/source/drivers/file/FStatement.cxx
+++ b/connectivity/source/drivers/file/FStatement.cxx
@@ -230,20 +230,6 @@ void OStatement_Base::clearMyResultSet () throw (SQLException)
m_xResultSet = Reference< XResultSet>();
}
-//--------------------------------------------------------------------
-// setWarning
-// Sets the warning
-//--------------------------------------------------------------------
-
-void OStatement_Base::setWarning (const SQLWarning &ex) throw( SQLException)
-{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen at sun.com", "OStatement_Base::setWarning " );
- ::osl::MutexGuard aGuard( m_aMutex );
- checkDisposed(OStatement_BASE::rBHelper.bDisposed);
-
-
- m_aLastWarning = ex;
-}
// -------------------------------------------------------------------------
Any SAL_CALL OStatement_Base::getWarnings( ) throw(SQLException, RuntimeException)
diff --git a/connectivity/source/inc/file/FStatement.hxx b/connectivity/source/inc/file/FStatement.hxx
index b7a0bee..a0772b3 100644
--- a/connectivity/source/inc/file/FStatement.hxx
+++ b/connectivity/source/inc/file/FStatement.hxx
@@ -119,7 +119,6 @@ namespace connectivity
void reset () throw( ::com::sun::star::sdbc::SQLException);
void clearMyResultSet () throw( ::com::sun::star::sdbc::SQLException);
- void setWarning (const ::com::sun::star::sdbc::SQLWarning &ex) throw( ::com::sun::star::sdbc::SQLException);
sal_Int32 getPrecision ( sal_Int32 sqlType);
void disposeResultSet();
diff --git a/connectivity/source/inc/sqlscan.hxx b/connectivity/source/inc/sqlscan.hxx
index 1b854f0..d469f82 100644
--- a/connectivity/source/inc/sqlscan.hxx
+++ b/connectivity/source/inc/sqlscan.hxx
@@ -69,7 +69,6 @@ namespace connectivity
void setScanner(sal_Bool _bNull=sal_False);
// rules settings
void SetRule(sal_Int32 nRule) {m_nRule = nRule;}
- sal_Int32 GetCurrentRule() const;
sal_Int32 GetGERRule() const;
sal_Int32 GetENGRule() const;
sal_Int32 GetSQLRule() const;
diff --git a/connectivity/source/parse/sqlflex.l b/connectivity/source/parse/sqlflex.l
index 43b5c29..d17128e 100755
--- a/connectivity/source/parse/sqlflex.l
+++ b/connectivity/source/parse/sqlflex.l
@@ -799,7 +799,6 @@ IParseContext::InternationalKeyCode OSQLScanner::getInternationalTokenID(const s
return (m_bInternational) ? m_pContext->getIntlKeyCode(::rtl::OString(sToken) ) : IParseContext::KEY_NONE;
}
// -------------------------------------------------------------------------
-sal_Int32 OSQLScanner::GetCurrentRule() const { return m_nRule; }
sal_Int32 OSQLScanner::GetGERRule() const { return PREDICATE_GER; }
sal_Int32 OSQLScanner::GetENGRule() const { return PREDICATE_ENG; }
sal_Int32 OSQLScanner::GetSQLRule() const { return SQL; }
diff --git a/sc/inc/cell.hxx b/sc/inc/cell.hxx
index de4d1ad..9499084 100644
--- a/sc/inc/cell.hxx
+++ b/sc/inc/cell.hxx
@@ -188,7 +188,7 @@ public:
#ifdef USE_MEMPOOL
DECL_FIXEDMEMPOOL_NEWDEL( ScValueCell )
#endif
- ScValueCell();
+
explicit ScValueCell( double fValue );
#if OSL_DEBUG_LEVEL > 0
@@ -433,7 +433,6 @@ public:
bool TestTabRefAbs(SCTAB nTable);
void UpdateCompile( bool bForceIfNameInUse = false );
void FindRangeNamesInUse(std::set<sal_uInt16>& rIndexes) const;
- void ReplaceRangeNamesInUse( const ScRangeData::IndexMap& rMap );
bool IsSubTotal() const { return bSubTotal; }
bool IsChanged() const;
void ResetChanged();
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 446f4de..7fd5be7 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -292,7 +292,6 @@ public:
void SetTabNo(SCTAB nNewTab);
void FindRangeNamesInUse(SCROW nRow1, SCROW nRow2, std::set<sal_uInt16>& rIndexes) const;
- void ReplaceRangeNamesInUse( SCROW nRow1, SCROW nRow2, const ScRangeData::IndexMap& rMap );
const SfxPoolItem* GetAttr( SCROW nRow, sal_uInt16 nWhich ) const;
const ScPatternAttr* GetPattern( SCROW nRow ) const;
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 6ae7572..b4df35b 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1197,7 +1197,6 @@ public:
SC_DLLPUBLIC sal_uLong AddCondFormat( ScConditionalFormat* pNew, SCTAB nTab );
void DeleteConditionalFormat( sal_uLong nIndex, SCTAB nTab );
- SC_DLLPUBLIC void FindConditionalFormat( sal_uLong nKey, SCTAB nTab, ScRangeList& rRanges );
SC_DLLPUBLIC void FindConditionalFormat( sal_uLong nKey, ScRangeList& rRanges, SCTAB nTab );
void ConditionalChanged( sal_uLong nKey, SCTAB nTab );
diff --git a/sc/inc/nameuno.hxx b/sc/inc/nameuno.hxx
index ee66e26..97befcb 100644
--- a/sc/inc/nameuno.hxx
+++ b/sc/inc/nameuno.hxx
@@ -163,8 +163,6 @@ public:
throw(::com::sun::star::uno::RuntimeException);
static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId();
- static ScNamedRangeObj* getImplementation( const com::sun::star::uno::Reference<
- com::sun::star::uno::XInterface> xObj );
// XServiceInfo
virtual ::rtl::OUString SAL_CALL getImplementationName()
diff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxx
index 4e96063..d370328 100644
--- a/sc/inc/rangenam.hxx
+++ b/sc/inc/rangenam.hxx
@@ -154,8 +154,6 @@ public:
void ValidateTabRefs();
- void ReplaceRangeNamesInUse( const IndexMap& rMap );
-
static void MakeValidName( String& rName );
SC_DLLPUBLIC static bool IsNameValid( const String& rName, ScDocument* pDoc );
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 78cd977..95ab430 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -479,8 +479,6 @@ public:
void SetTabNo(SCTAB nNewTab);
void FindRangeNamesInUse(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
std::set<sal_uInt16>& rIndexes) const;
- void ReplaceRangeNamesInUse(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
- const ScRangeData::IndexMap& rMap );
void Fill( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
sal_uLong nFillCount, FillDir eFillDir, FillCmd eFillCmd, FillDateCmd eFillDateCmd,
double nStepValue, double nMaxValue, ScProgress* pProgress);
diff --git a/sc/inc/typedstrdata.hxx b/sc/inc/typedstrdata.hxx
index e33d16a..1509845 100644
--- a/sc/inc/typedstrdata.hxx
+++ b/sc/inc/typedstrdata.hxx
@@ -52,7 +52,6 @@ public:
bool IsStrData() const;
SC_DLLPUBLIC const rtl::OUString& GetString() const;
- double GetValue() const;
StringType GetStringType() const;
struct LessCaseSensitive : std::binary_function<ScTypedStrData, ScTypedStrData, bool>
diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx
index f81460c..338b0ab 100644
--- a/sc/source/core/data/cell.cxx
+++ b/sc/source/core/data/cell.cxx
@@ -633,12 +633,6 @@ ScNoteCell::~ScNoteCell()
// ============================================================================
-ScValueCell::ScValueCell() :
- ScBaseCell( CELLTYPE_VALUE ),
- mfValue( 0.0 )
-{
-}
-
ScValueCell::ScValueCell( double fValue ) :
ScBaseCell( CELLTYPE_VALUE ),
mfValue( fValue )
diff --git a/sc/source/core/data/cell2.cxx b/sc/source/core/data/cell2.cxx
index 3a0c6d8..fa3ac1d 100644
--- a/sc/source/core/data/cell2.cxx
+++ b/sc/source/core/data/cell2.cxx
@@ -1543,26 +1543,6 @@ void ScFormulaCell::FindRangeNamesInUse(std::set<sal_uInt16>& rIndexes) const
lcl_FindRangeNamesInUse( rIndexes, pCode, pDocument->GetRangeName() );
}
-void ScFormulaCell::ReplaceRangeNamesInUse( const ScRangeData::IndexMap& rMap )
-{
- for( FormulaToken* p = pCode->First(); p; p = pCode->Next() )
- {
- if( p->GetOpCode() == ocName )
- {
- sal_uInt16 nIndex = p->GetIndex();
- ScRangeData::IndexMap::const_iterator itr = rMap.find(nIndex);
- sal_uInt16 nNewIndex = itr == rMap.end() ? nIndex : itr->second;
- if ( nIndex != nNewIndex )
- {
- p->SetIndex( nNewIndex );
- bCompile = true;
- }
- }
- }
- if( bCompile )
- CompileTokenArray();
-}
-
bool ScFormulaCell::IsChanged() const
{
return bChanged;
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 272a646..db99462 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -1856,24 +1856,6 @@ void ScColumn::FindRangeNamesInUse(SCROW nRow1, SCROW nRow2, std::set<sal_uInt16
((ScFormulaCell*)maItems[i].pCell)->FindRangeNamesInUse(rIndexes);
}
-void ScColumn::ReplaceRangeNamesInUse(SCROW nRow1, SCROW nRow2,
- const ScRangeData::IndexMap& rMap )
-{
- if ( !maItems.empty() )
- for (SCSIZE i = 0; i < maItems.size(); i++)
- {
- if ((maItems[i].nRow >= nRow1) &&
- (maItems[i].nRow <= nRow2) &&
- (maItems[i].pCell->GetCellType() == CELLTYPE_FORMULA))
- {
- SCROW nRow = maItems[i].nRow;
- ((ScFormulaCell*)maItems[i].pCell)->ReplaceRangeNamesInUse( rMap );
- if ( nRow != maItems[i].nRow )
- Search( nRow, i ); // Listener geloescht/eingefuegt?
- }
- }
-}
-
void ScColumn::SetDirtyVar()
{
for (SCSIZE i=0; i<maItems.size(); i++)
diff --git a/sc/source/core/data/documen4.cxx b/sc/source/core/data/documen4.cxx
index a757d04..8eca485 100644
--- a/sc/source/core/data/documen4.cxx
+++ b/sc/source/core/data/documen4.cxx
@@ -727,12 +727,6 @@ const ScValidationData* ScDocument::GetValidationEntry( sal_uLong nIndex ) const
return NULL;
}
-void ScDocument::FindConditionalFormat( sal_uLong nKey, SCTAB nTab, ScRangeList& rRanges )
-{
- if(VALIDTAB(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab])
- maTabs[nTab]->FindConditionalFormat( nKey, rRanges );
-}
-
void ScDocument::FindConditionalFormat( sal_uLong nKey, ScRangeList& rRanges, SCTAB nTab )
{
if(VALIDTAB(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab])
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index bdf7832..090345a 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -1586,16 +1586,6 @@ void ScTable::FindRangeNamesInUse(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW n
aCol[i].FindRangeNamesInUse(nRow1, nRow2, rIndexes);
}
-void ScTable::ReplaceRangeNamesInUse(SCCOL nCol1, SCROW nRow1,
- SCCOL nCol2, SCROW nRow2,
- const ScRangeData::IndexMap& rMap )
-{
- for (SCCOL i = nCol1; i <= nCol2 && (ValidCol(i)); i++)
- {
- aCol[i].ReplaceRangeNamesInUse( nRow1, nRow2, rMap );
- }
-}
-
void ScTable::ExtendPrintArea( OutputDevice* pDev,
SCCOL /* nStartCol */, SCROW nStartRow, SCCOL& rEndCol, SCROW nEndRow )
{
diff --git a/sc/source/core/tool/typedstrdata.cxx b/sc/source/core/tool/typedstrdata.cxx
index 8faaace..811c5d8 100644
--- a/sc/source/core/tool/typedstrdata.cxx
+++ b/sc/source/core/tool/typedstrdata.cxx
@@ -114,11 +114,6 @@ const rtl::OUString& ScTypedStrData::GetString() const
return maStrValue;
}
-double ScTypedStrData::GetValue() const
-{
- return mfValue;
-}
-
ScTypedStrData::StringType ScTypedStrData::GetStringType() const
{
return meStrType;
diff --git a/sc/source/ui/condformat/colorformat.cxx b/sc/source/ui/condformat/colorformat.cxx
index ba54db2..d8d15a9 100644
--- a/sc/source/ui/condformat/colorformat.cxx
+++ b/sc/source/ui/condformat/colorformat.cxx
@@ -177,55 +177,6 @@ ScDataBarSettingsDlg::ScDataBarSettingsDlg(Window* pWindow, const ScDataBarForma
TypeSelectHdl(NULL);
}
-ScDataBarSettingsDlg::ScDataBarSettingsDlg(Window* pWindow, ScDataBarFormat* pFormat):
- ModalDialog( pWindow, ScResId( RID_SCDLG_DATABAR ) ),
- maBtnOk( this, ScResId( BTN_OK ) ),
- maBtnCancel( this, ScResId( BTN_CANCEL ) ),
- maFlBarColors( this, ScResId( FL_BAR_COLORS ) ),
- maFlAxes( this, ScResId( FL_AXIS ) ),
- maFlValues( this, ScResId( FL_VALUES ) ),
- maFtMin( this, ScResId( FT_MINIMUM ) ),
- maFtMax( this, ScResId( FT_MAXIMUM ) ),
- maFtPositive( this, ScResId( FT_POSITIVE ) ),
- maFtNegative( this, ScResId( FT_NEGATIVE ) ),
- maFtPosition( this, ScResId( FT_POSITION ) ),
- maFtAxisColor( this, ScResId( FT_COLOR_AXIS ) ),
- maLbPos( this, ScResId( LB_POS ) ),
- maLbNeg( this, ScResId( LB_NEG ) ),
- maLbAxisCol( this, ScResId( LB_COL_AXIS ) ),
- maLbTypeMin( this, ScResId( LB_TYPE ) ),
- maLbTypeMax( this, ScResId( LB_TYPE ) ),
- maLbAxisPos( this, ScResId( LB_AXIS_POSITION ) ),
- maEdMin( this, ScResId( ED_MIN ) ),
- maEdMax( this, ScResId( ED_MAX ) ),
- maStrWarnSameValue( SC_RESSTR( STR_WARN_SAME_VALUE ) )
-{
- Init();
- FreeResource();
-
- const ScDataBarFormatData* pData = pFormat->GetDataBarData();
- maLbPos.SelectEntry( pData->maPositiveColor );
- if(pData->mpNegativeColor)
- maLbNeg.SelectEntry( *pData->mpNegativeColor );
-
- switch (pData->meAxisPosition)
- {
- case databar::NONE:
- maLbAxisPos.SelectEntryPos(2);
- break;
- case databar::AUTOMATIC:
- maLbAxisPos.SelectEntryPos(0);
- break;
- case databar::MIDDLE:
- maLbAxisPos.SelectEntryPos(1);
- break;
- }
- ::SetType(pData->mpLowerLimit.get(), maLbTypeMin);
- ::SetType(pData->mpUpperLimit.get(), maLbTypeMax);
- SetValue(pData->mpLowerLimit.get(), maEdMin);
- SetValue(pData->mpUpperLimit.get(), maEdMax);
-}
-
void ScDataBarSettingsDlg::Init()
{
SfxObjectShell* pDocSh = SfxObjectShell::Current();
diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx
index 25ff9a5..aa834ae 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -921,20 +921,6 @@ IMPL_LINK_NOARG( ScCondFrmtEntry, ConditionTypeSelectHdl )
return 0;
}
-ScCondFormatList::ScCondFormatList(Window* pParent, const ResId& rResId, ScDocument* pDoc):
- Control(pParent, rResId),
- mbHasScrollBar(false),
- mpScrollBar(new ScrollBar(this, WB_VERT )),
- mnTopIndex(0),
- mpDoc(pDoc)
-{
- mpScrollBar->SetScrollHdl( LINK( this, ScCondFormatList, ScrollHdl ) );
- mpScrollBar->EnableDrag();
-
- RecalcAll();
- FreeResource();
-}
-
ScCondFormatList::ScCondFormatList(Window* pParent, const ResId& rResId, ScDocument* pDoc, const ScConditionalFormat* pFormat, const ScRangeList& rRanges, const ScAddress& rPos):
Control(pParent, rResId),
mbHasScrollBar(false),
diff --git a/sc/source/ui/dbgui/csvcontrol.cxx b/sc/source/ui/dbgui/csvcontrol.cxx
index 00fc0a7..5ebb4d0 100644
--- a/sc/source/ui/dbgui/csvcontrol.cxx
+++ b/sc/source/ui/dbgui/csvcontrol.cxx
@@ -78,14 +78,6 @@ ScCsvControl::ScCsvControl( ScCsvControl& rParent ) :
{
}
-ScCsvControl::ScCsvControl( Window* pParent, const ScCsvLayoutData& rData, WinBits nStyle ) :
- Control( pParent, nStyle ),
- mrData( rData ),
- mpAccessible( NULL ),
- mbValidGfx( false )
-{
-}
-
ScCsvControl::ScCsvControl( Window* pParent, const ScCsvLayoutData& rData, const ResId& rResId ) :
Control( pParent, rResId ),
mrData( rData ),
diff --git a/sc/source/ui/inc/colorformat.hxx b/sc/source/ui/inc/colorformat.hxx
index fffbb34..c78321f 100644
--- a/sc/source/ui/inc/colorformat.hxx
+++ b/sc/source/ui/inc/colorformat.hxx
@@ -74,7 +74,6 @@ private:
public:
ScDataBarSettingsDlg(Window* pParent);
ScDataBarSettingsDlg(Window* pParent, const ScDataBarFormatData& rData);
- ScDataBarSettingsDlg(Window* pParent, ScDataBarFormat* pFormat);
ScDataBarFormatData* GetData();
};
diff --git a/sc/source/ui/inc/condformatdlg.hxx b/sc/source/ui/inc/condformatdlg.hxx
index 8b03c29..d7fb699 100644
--- a/sc/source/ui/inc/condformatdlg.hxx
+++ b/sc/source/ui/inc/condformatdlg.hxx
@@ -164,7 +164,6 @@ private:
void RecalcAll();
void DoScroll(long nDiff);
public:
- ScCondFormatList( Window* pParent, const ResId& rResId, ScDocument* pDoc );
ScCondFormatList( Window* pParent, const ResId& rResId, ScDocument* pDoc, const ScConditionalFormat* pFormat, const ScRangeList& rRanges, const ScAddress& rPos);
ScConditionalFormat* GetConditionalFormat() const;
diff --git a/sc/source/ui/inc/csvcontrol.hxx b/sc/source/ui/inc/csvcontrol.hxx
index 6a47b67..692c93f 100644
--- a/sc/source/ui/inc/csvcontrol.hxx
+++ b/sc/source/ui/inc/csvcontrol.hxx
@@ -276,7 +276,6 @@ private:
// ------------------------------------------------------------------------
public:
explicit ScCsvControl( ScCsvControl& rParent );
- explicit ScCsvControl( Window* pParent, const ScCsvLayoutData& rData, WinBits nStyle = 0 );
explicit ScCsvControl( Window* pParent, const ScCsvLayoutData& rData, const ResId& rResId );
virtual ~ScCsvControl();
diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx
index e6be63c..ff0cea5 100644
--- a/sc/source/ui/inc/viewfunc.hxx
+++ b/sc/source/ui/inc/viewfunc.hxx
@@ -188,7 +188,6 @@ public:
void SetNumFmtByStr( const String& rCode );
void ChangeNumFmtDecimals( sal_Bool bIncrement );
- void SetConditionalFormat( const ScConditionalFormat& rNew );
void SetValidation( const ScValidationData& rNew );
void ChangeIndent( sal_Bool bIncrement );
diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx
index 88f999a..0990261 100644
--- a/sc/source/ui/unoobj/nameuno.cxx
+++ b/sc/source/ui/unoobj/nameuno.cxx
@@ -482,15 +482,6 @@ const uno::Sequence<sal_Int8>& ScNamedRangeObj::getUnoTunnelId()
return theScNamedRangeObjUnoTunnelId::get().getSeq();
}
-ScNamedRangeObj* ScNamedRangeObj::getImplementation( const uno::Reference<uno::XInterface> xObj )
-{
- ScNamedRangeObj* pRet = NULL;
- uno::Reference<lang::XUnoTunnel> xUT( xObj, uno::UNO_QUERY );
- if (xUT.is())
- pRet = reinterpret_cast<ScNamedRangeObj*>(sal::static_int_cast<sal_IntPtr>(xUT->getSomething(getUnoTunnelId())));
- return pRet;
-}
-
//------------------------------------------------------------------------
ScNamedRangesObj::ScNamedRangesObj(ScDocShell* pDocSh) :
diff --git a/sc/source/ui/vba/vbafoundfiles.cxx b/sc/source/ui/vba/vbafoundfiles.cxx
index b4229bc..33933f2 100644
--- a/sc/source/ui/vba/vbafoundfiles.cxx
+++ b/sc/source/ui/vba/vbafoundfiles.cxx
@@ -29,12 +29,6 @@
#include "vbafoundfiles.hxx"
-////////////////////////////////VbaFoundFilesEnum//////////////////////////////////////////
-VbaFoundFilesEnum::VbaFoundFilesEnum() : m_nIndex(0)
-{
-
-}
-
VbaFoundFilesEnum::VbaFoundFilesEnum( css::uno::Sequence<rtl::OUString>& sFileList ) : m_nIndex(0), m_sFileList(sFileList)
{
@@ -45,12 +39,6 @@ VbaFoundFilesEnum::~VbaFoundFilesEnum()
}
-void VbaFoundFilesEnum::SetFileList( css::uno::Sequence<rtl::OUString>& sFileList )
-{
- m_nIndex = 0;
- m_sFileList = sFileList;
-}
-
sal_Int32 SAL_CALL VbaFoundFilesEnum::getCount() throw (css::uno::RuntimeException)
{
return m_sFileList.getLength();
diff --git a/sc/source/ui/vba/vbafoundfiles.hxx b/sc/source/ui/vba/vbafoundfiles.hxx
index 79fd526..f3570fe 100644
--- a/sc/source/ui/vba/vbafoundfiles.hxx
+++ b/sc/source/ui/vba/vbafoundfiles.hxx
@@ -46,12 +46,9 @@ private:
css::uno::Sequence< rtl::OUString > m_sFileList;
public:
- VbaFoundFilesEnum();
VbaFoundFilesEnum( css::uno::Sequence< rtl::OUString >& sFileList );
~VbaFoundFilesEnum();
- void SetFileList( css::uno::Sequence< rtl::OUString >& sFileList );
-
// XIndexAccess
virtual sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException);
virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException);
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 8f83dbe..9b3efb6 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -3071,19 +3071,6 @@ void ScViewFunc::SetSelectionFrameLines( const SvxBorderLine* pLine,
#undef SET_LINE_ATTRIBUTES
-
-//----------------------------------------------------------------------------
-
-void ScViewFunc::SetConditionalFormat( const ScConditionalFormat& rNew )
-{
- ScDocument* pDoc = GetViewData()->GetDocument();
- sal_uLong nIndex = pDoc->AddCondFormat(rNew.Clone(), GetViewData()->GetTabNo()); // for it there is no Undo
- SfxUInt32Item aItem( ATTR_CONDITIONAL, nIndex );
-
- ApplyAttr( aItem ); // with Paint and Undo...
-}
-
-
//----------------------------------------------------------------------------
void ScViewFunc::SetValidation( const ScValidationData& rNew )
diff --git a/svx/inc/svx/sdr/attribute/sdrtextattribute.hxx b/svx/inc/svx/sdr/attribute/sdrtextattribute.hxx
index bf8f14b..e3d4220 100644
--- a/svx/inc/svx/sdr/attribute/sdrtextattribute.hxx
+++ b/svx/inc/svx/sdr/attribute/sdrtextattribute.hxx
@@ -111,7 +111,6 @@ namespace drawinglayer
sal_Int32 getTextUpperDistance() const;
sal_Int32 getTextRightDistance() const;
sal_Int32 getTextLowerDistance() const;
- sal_uInt32 getPropertiesVersion() const;
SdrTextHorzAdjust getSdrTextHorzAdjust() const;
SdrTextVertAdjust getSdrTextVertAdjust() const;
diff --git a/svx/source/sdr/attribute/sdrtextattribute.cxx b/svx/source/sdr/attribute/sdrtextattribute.cxx
index e271d06..022829f 100644
--- a/svx/source/sdr/attribute/sdrtextattribute.cxx
+++ b/svx/source/sdr/attribute/sdrtextattribute.cxx
@@ -436,11 +436,6 @@ namespace drawinglayer
return mpSdrTextAttribute->getTextLowerDistance();
}
- sal_uInt32 SdrTextAttribute::getPropertiesVersion() const
- {
- return mpSdrTextAttribute->getPropertiesVersion();
- }
-
SdrTextHorzAdjust SdrTextAttribute::getSdrTextHorzAdjust() const
{
return mpSdrTextAttribute->getSdrTextHorzAdjust();
diff --git a/toolkit/inc/toolkit/helper/vclunohelper.hxx b/toolkit/inc/toolkit/helper/vclunohelper.hxx
index bb6e1eb..1caa9c4 100644
--- a/toolkit/inc/toolkit/helper/vclunohelper.hxx
+++ b/toolkit/inc/toolkit/helper/vclunohelper.hxx
@@ -100,10 +100,6 @@ public:
// Region
static Region GetRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& rxRegion );
-
- // Pointer
- static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPointer> CreatePointer();
-
// Polygon
static Polygon CreatePolygon( const ::com::sun::star::uno::Sequence< sal_Int32 >& DataX, const ::com::sun::star::uno::Sequence< sal_Int32 >& DataY );
diff --git a/toolkit/source/helper/vclunohelper.cxx b/toolkit/source/helper/vclunohelper.cxx
index 0d24b23..7bd2587 100644
--- a/toolkit/source/helper/vclunohelper.cxx
+++ b/toolkit/source/helper/vclunohelper.cxx
@@ -169,12 +169,6 @@ Region VCLUnoHelper::GetRegion( const ::com::sun::star::uno::Reference< ::com::s
return xWin;
}
-::com::sun::star::uno::Reference< ::com::sun::star::awt::XPointer> VCLUnoHelper::CreatePointer()
-{
- ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPointer> xPointer = new VCLXPointer;
- return xPointer;
-}
-
OutputDevice* VCLUnoHelper::GetOutputDevice( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice>& rxDevice )
{
OutputDevice* pOutDev = NULL;
diff --git a/unusedcode.easy b/unusedcode.easy
index 750d7a7..b36814b 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -37,12 +37,8 @@ ScCompressedArray<int, unsigned short>::Remove(int, unsigned long)
ScCompressedArray<int, unsigned short>::ScCompressedArray(int, unsigned short const&, unsigned long)
ScCompressedArray<int, unsigned short>::ScCompressedArray(int, unsigned short const*, unsigned long)
ScCompressedArray<int, unsigned short>::SetValue(int, unsigned short const&)
-ScCondFormatList::ScCondFormatList(Window*, ResId const&, ScDocument*)
ScCondFrmtItem::ScCondFrmtItem(unsigned short, ScConditionalFormat const&)
-ScCsvControl::ScCsvControl(Window*, ScCsvLayoutData const&, long)
ScDBCollection::AnonDBs::erase(boost::void_ptr_iterator<__gnu_debug::_Safe_iterator<__gnu_cxx::__normal_iterator<void**, std::__cxx1998::vector<void*, std::allocator<void*> > >, std::__debug::vector<void*, std::allocator<void*> > >, ScDBData>)
-ScDataBarSettingsDlg::ScDataBarSettingsDlg(Window*, ScDataBarFormat*)
-ScDocument::FindConditionalFormat(unsigned long, short, ScRangeList&)
ScHTMLColOffset::Insert(ScHTMLColOffset const*, unsigned short, unsigned short)
ScHTMLColOffset::Insert(unsigned long const&, unsigned short&)
ScHTMLColOffset::Insert(unsigned long const*, unsigned short)
@@ -50,7 +46,6 @@ ScHTMLColOffset::Remove(unsigned long const&, unsigned short)
ScHTMLColOffset_SAR::Replace(unsigned long const&, unsigned short)
ScHTMLColOffset_SAR::Replace(unsigned long const*, unsigned short, unsigned short)
ScHTMLColOffset_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned long const&, void*), void*)
-ScNamedRangeObj::getImplementation(com::sun::star::uno::Reference<com::sun::star::uno::XInterface>)
ScRTFColTwips::Insert(ScRTFColTwips const*, unsigned short, unsigned short)
ScRTFColTwips::Insert(unsigned long const&, unsigned short&)
ScRTFColTwips::Insert(unsigned long const*, unsigned short)
@@ -59,24 +54,19 @@ ScRTFColTwips_SAR::Replace(unsigned long const&, unsigned short)
ScRTFColTwips_SAR::Replace(unsigned long const*, unsigned short, unsigned short)
ScRTFColTwips_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned long const&, void*), void*)
ScSimpleRangeList::Range::contains(ScSimpleRangeList::Range const&) const
-ScTable::ReplaceRangeNamesInUse(short, int, short, int, std::__debug::map<unsigned short, unsigned short, std::less<unsigned short>, std::allocator<std::pair<unsigned short const, unsigned short> > > const&)
-ScTypedStrData::GetValue() const
ScValidationEntries_Impl::Insert(ScValidationData* const&, unsigned short&)
ScValidationEntries_Impl::Insert(ScValidationData* const*, unsigned short)
ScValidationEntries_Impl::Insert(ScValidationEntries_Impl const*, unsigned short, unsigned short)
ScValidationEntries_Impl::Remove(ScValidationData* const&, unsigned short)
ScValidationEntries_Impl::Remove(unsigned short, unsigned short)
-ScValueCell::ScValueCell()
ScVbaFormat<ooo::vba::excel::XRange>::getXServiceInfo()
ScVbaFormat<ooo::vba::excel::XRange>::setNumberFormat(com::sun::star::lang::Locale, rtl::OUString const&)
ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent()
ScVbaFormat<ooo::vba::excel::XStyle>::getXServiceInfo()
ScVbaFormat<ooo::vba::excel::XStyle>::setAddIndent(com::sun::star::uno::Any const&)
ScVbaFormat<ooo::vba::excel::XStyle>::setNumberFormat(com::sun::star::lang::Locale, rtl::OUString const&)
-ScViewFunc::SetConditionalFormat(ScConditionalFormat const&)
SecurityEnvironment_NssImpl::getImplementation(com::sun::star::uno::Reference<com::sun::star::uno::XInterface>)
SfxDockingWrapper::GetChildWindowId()
-SfxFilterPtrArr::DeleteAndDestroy(unsigned short, unsigned short)
SfxModuleArr_Impl::DeleteAndDestroy(unsigned short, unsigned short)
SfxNavigatorWrapper::GetChildWindowId()
SfxPartChildWnd_Impl::GetChildWindowId()
@@ -106,10 +96,10 @@ SvxMSDffShapeInfos::Insert(SvxMSDffShapeInfo* const*, unsigned short)
SvxMSDffShapeInfos::Insert(SvxMSDffShapeInfos const*, unsigned short, unsigned short)
SvxMSDffShapeInfos::Remove(SvxMSDffShapeInfo* const&, unsigned short)
SvxMSDffShapeTxBxSort::DeleteAndDestroy(unsigned short, unsigned short)
-SvxMSDffShapeTxBxSort::Insert(SvxMSDffShapeOrder* const&, unsigned short&)
-SvxMSDffShapeTxBxSort::Insert(SvxMSDffShapeOrder* const*, unsigned short)
+SvxMSDffShapeTxBxSort::Insert(SvxMSDffShapeOrder const*&, unsigned short&)
+SvxMSDffShapeTxBxSort::Insert(SvxMSDffShapeOrder const**, unsigned short)
SvxMSDffShapeTxBxSort::Insert(SvxMSDffShapeTxBxSort const*, unsigned short, unsigned short)
-SvxMSDffShapeTxBxSort::Remove(SvxMSDffShapeOrder* const&, unsigned short)
+SvxMSDffShapeTxBxSort::Remove(SvxMSDffShapeOrder const*&, unsigned short)
SvxMSDffShapeTxBxSort::Remove(unsigned short, unsigned short)
SvxRubyChildWindow::GetChildWindowId()
SvxTabStopArr::Insert(SvxTabStop const&, unsigned short&)
@@ -221,11 +211,8 @@ SystemChildWindow::SystemChildWindow(Window*, ResId const&)
TempFile::IsValid() const
TextEngine::GetLeftMargin() const
TransferableDataHelper::GetInterface(com::sun::star::datatransfer::DataFlavor const&, com::sun::star::uno::Reference<com::sun::star::uno::XInterface>&)
-VCLUnoHelper::CreatePointer()
VCLXPrinterServer::getImplementationId()
VCLXPrinterServer::getTypes()
-VbaFoundFilesEnum::SetFileList(com::sun::star::uno::Sequence<rtl::OUString>&)
-VbaFoundFilesEnum::VbaFoundFilesEnum()
VclEventListeners2::~VclEventListeners2()
ViewShell::getIDocumentFieldsAccess() const
VirtualDevice::SetOutputSizePixelAndBuffer(Size const&, boost::shared_array<unsigned char> const&)
@@ -630,13 +617,10 @@ comphelper::OSelectionChangeListener::disposeAdapter()
comphelper::detail::ConfigurationWrapper::getGroupReadWrite(boost::shared_ptr<comphelper::ConfigurationChanges> const&, rtl::OUString const&) const
comphelper::detail::ConfigurationWrapper::getLocalizedPropertyValue(rtl::OUString const&) const
comphelper::detail::ConfigurationWrapper::setLocalizedPropertyValue(boost::shared_ptr<comphelper::ConfigurationChanges> const&, rtl::OUString const&, com::sun::star::uno::Any const&) const
-comphelper::findProperty(com::sun::star::beans::Property&, com::sun::star::uno::Sequence<com::sun::star::beans::Property>&, rtl::OUString const&)
connectivity::OKeyValue::OKeyValue()
connectivity::OSQLInternalNode::OSQLInternalNode(unsigned short const*, connectivity::SQLNodeType, unsigned int)
-connectivity::OSQLScanner::GetCurrentRule() const
connectivity::SQLError::getSQLState(int) const
connectivity::file::OStatement_Base::reset()
-connectivity::file::OStatement_Base::setWarning(com::sun::star::sdbc::SQLWarning const&)
connectivity::mozab::MQueryHelper::next()
connectivity::sdbcx::OGroup::OGroup(rtl::OUString const&, unsigned char)
connectivity::sdbcx::OGroup::OGroup(unsigned char)
@@ -650,7 +634,6 @@ dbtools::getConnection(rtl::OUString const&, rtl::OUString const&, rtl::OUString
dp_misc::TRACE(rtl::OString const&)
dp_misc::writeConsoleError(rtl::OString const&)
drawinglayer::attribute::SdrFormTextAttribute::getFormTextShdwTransp() const
-drawinglayer::attribute::SdrTextAttribute::getPropertiesVersion() const
drawinglayer::attribute::SdrTextAttribute::isWrongSpell() const
formula::FormulaTokenIterator::First()
jfw_plugin::VendorBase::createInstance()
commit f03a3edf2523c208948059861e0df48567834d0d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jun 14 19:00:59 2012 +0100
SfxPointerServer doesn't exist, so MI_HATS_REPARIERT not useful anymore either
Change-Id: Ic727e2a6a30c16b3467b8c169512a7cb2757f146
diff --git a/svl/inc/svl/itemset.hxx b/svl/inc/svl/itemset.hxx
index 2b019e2..00477fe 100644
--- a/svl/inc/svl/itemset.hxx
+++ b/svl/inc/svl/itemset.hxx
@@ -43,23 +43,10 @@ typedef SfxPoolItem const** SfxItemArray;
#define USHORT_ARG int
-#ifdef MI_HATS_REPARIERT
-#ifndef DBG
-#ifdef DBG_UTILx
-#define DBG(s) s
-#define _pChildCount(THIS) ( *(sal_uInt16**)SfxPointerServer::GetServer()->GetPointer(THIS) )
-#define _pChildCountCtor ( (*(sal_uInt16**)SfxPointerServer::GetServer()->CreatePointer(this)) = new sal_uInt16 )
-#define _pChildCountDtor ( SfxPointerServer::GetServer()->ReleasePointer(this) )
-#else
-#define DBG(s)
-#endif
-#endif
-#else
#ifdef DBG
#undef DBG
#endif
#define DBG(s)
-#endif
//========================================================================
commit 5dd3bf34cb7a469d98c910fff48217f5dbb3b31e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jun 14 15:23:01 2012 +0100
use new configmgr api and devomit visible code
Change-Id: I386725e07c34336249dfc935b1e9f9624d1d3be8
diff --git a/i18nutil/prj/build.lst b/i18nutil/prj/build.lst
index f856807..1d0003f 100644
--- a/i18nutil/prj/build.lst
+++ b/i18nutil/prj/build.lst
@@ -1,2 +1,2 @@
-inu i18nutil : sal cppu comphelper offapi ICU:icu NULL
+inu i18nutil : sal cppu configmgr comphelper offapi ICU:icu NULL
inu i18nutil\prj nmake - all inu_prj NULL
diff --git a/i18nutil/source/utility/paper.cxx b/i18nutil/source/utility/paper.cxx
index 0f6b813..8f4fb91 100644
--- a/i18nutil/source/utility/paper.cxx
+++ b/i18nutil/source/utility/paper.cxx
@@ -28,14 +28,12 @@
#include <osl/diagnose.h>
+#include <officecfg/Setup.hxx>
+#include <officecfg/System.hxx>
#include <sal/config.h>
#include <sal/macros.h>
#include <rtl/ustring.hxx>
#include <rtl/string.hxx>
-#include <comphelper/processfactory.hxx>
-#include <com/sun/star/i18n/ScriptType.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
#include "i18nutil/paper.hxx"
@@ -217,38 +215,7 @@ long PaperInfo::sloppyFitPageDimension(long nDimension)
PaperInfo PaperInfo::getSystemDefaultPaper()
{
- using ::com::sun::star::uno::Reference;
- using ::com::sun::star::lang::XMultiServiceFactory;
- using ::com::sun::star::uno::UNO_QUERY_THROW;
- using ::com::sun::star::uno::Sequence;
- using ::com::sun::star::uno::Any;
- using ::com::sun::star::container::XNameAccess;
- using ::com::sun::star::uno::Exception;
-# define CREATE_OUSTRING( ascii ) \
- rtl::OUString::intern( RTL_CONSTASCII_USTRINGPARAM( ascii ) )
-
- rtl::OUString aLocaleStr;
-
- Reference< XMultiServiceFactory > xConfigProv;
- Reference< XNameAccess > xConfigNA;
- Sequence< Any > aArgs( 1 );
- try
- {
- Reference< XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory();
- xConfigProv = Reference< XMultiServiceFactory >(
- xFactory->createInstance( CREATE_OUSTRING( "com.sun.star.configuration.ConfigurationProvider" ) ),
- UNO_QUERY_THROW);
-
- aArgs[ 0 ] <<= CREATE_OUSTRING( "org.openoffice.Setup/L10N/" );
- xConfigNA = Reference< XNameAccess >(xConfigProv->createInstanceWithArguments(
- CREATE_OUSTRING( "com.sun.star.configuration.ConfigurationAccess" ), aArgs ), UNO_QUERY_THROW);
-
- // try user-defined locale setting
- xConfigNA->getByName( CREATE_OUSTRING( "ooSetupSystemLocale" ) ) >>= aLocaleStr;
- }
- catch(const Exception&)
- {
- }
+ rtl::OUString aLocaleStr = officecfg::Setup::L10N::ooSetupSystemLocale::get();
#ifdef UNX
// if set to "use system", get papersize from system
@@ -364,24 +331,12 @@ PaperInfo PaperInfo::getSystemDefaultPaper()
}
#endif
- try
- {
- // if set to "use system", try to get locale from system
- if (aLocaleStr.isEmpty() && xConfigProv.is())
- {
- aArgs[ 0 ] <<= CREATE_OUSTRING( "org.openoffice.System/L10N/" );
- xConfigNA.set( xConfigProv->createInstanceWithArguments(
- CREATE_OUSTRING( "com.sun.star.configuration.ConfigurationAccess" ), aArgs ),
- UNO_QUERY_THROW );
- xConfigNA->getByName( CREATE_OUSTRING( "Locale" ) ) >>= aLocaleStr;
- }
- }
- catch(const Exception&)
- {
- }
+ // if set to "use system", try to get locale from system
+ if (aLocaleStr.isEmpty())
+ aLocaleStr = officecfg::System::L10N::Locale::get();
if (aLocaleStr.isEmpty())
- aLocaleStr = CREATE_OUSTRING("en-US");
+ aLocaleStr = rtl::OUString::intern(RTL_CONSTASCII_USTRINGPARAM("en-US"));
// convert locale string to locale struct
::com::sun::star::lang::Locale aSysLocale;
commit 57ea40b8b638ebbc8d7b5ade81bed3096c47ee95
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jun 14 14:42:28 2012 +0100
WaE: clear higher debugging levels warnings
Change-Id: I611dc412b5461f368f23aa8239e48d0e175f5168
diff --git a/cppu/source/uno/data.cxx b/cppu/source/uno/data.cxx
index d9209c7..9619dbf 100644
--- a/cppu/source/uno/data.cxx
+++ b/cppu/source/uno/data.cxx
@@ -357,15 +357,30 @@ CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_type_isAssignableFromData(
#define MAX_ALIGNMENT_4
#endif
-#define OFFSET_OF( s, m ) reinterpret_cast< int >((char *)&((s *)16)->m -16)
+#define OFFSET_OF( s, m ) reinterpret_cast< size_t >((char *)&((s *)16)->m -16)
#define BINTEST_VERIFY( c ) \
- if (! (c)) { fprintf( stderr, "### binary compatibility test failed: %s [line %d]!!!\n", #c, __LINE__ ); abort(); }
+ if (! (c)) \
+ { \
+ fprintf( stderr, "### binary compatibility test failed: %s [line %d]!!!\n", #c, __LINE__ ); \
+ abort(); \
+ }
+
#define BINTEST_VERIFYOFFSET( s, m, n ) \
- if (OFFSET_OF(s, m) != n) { fprintf( stderr, "### OFFSET_OF(" #s ", " #m ") = %" SAL_PRI_SIZET "u instead of expected %d!!!\n", OFFSET_OF(s, m), n ); abort(); }
+ if (OFFSET_OF(s, m) != static_cast<size_t>(n)) \
+ { \
+ fprintf(stderr, "### OFFSET_OF(" #s ", " #m ") = %" SAL_PRI_SIZET "u instead of expected %" SAL_PRI_SIZET "u!!!\n", \
+ OFFSET_OF(s, m), static_cast<size_t>(n)); \
+ abort(); \
+ }
#define BINTEST_VERIFYSIZE( s, n ) \
- if (sizeof(s) != n) { fprintf( stderr, "### sizeof(" #s ") = %d instead of expected %d!!!\n", (int)sizeof(s), n ); abort(); }
+ if (sizeof(s) != static_cast<size_t>(n)) \
+ { \
+ fprintf(stderr, "### sizeof(" #s ") = %" SAL_PRI_SIZET "u instead of expected %" SAL_PRI_SIZET "u!!!\n", \
+ sizeof(s), static_cast<size_t>(n)); \
+ abort(); \
+ }
struct C1
{
More information about the Libreoffice-commits
mailing list