[Libreoffice-commits] .: 4 commits - editeng/inc editeng/source linguistic/source lotuswordpro/source solenv/gbuild svl/inc svl/source svtools/inc svtools/source svx/inc svx/source tools/inc tools/source unusedcode.easy vcl/inc vcl/source
Caolán McNamara
caolan at kemper.freedesktop.org
Tue Oct 4 01:01:14 PDT 2011
editeng/inc/editeng/editeng.hxx | 4
editeng/source/editeng/editeng.cxx | 40 ----
linguistic/source/lngopt.cxx | 155 -------------------
linguistic/source/lngopt.hxx | 10 -
lotuswordpro/source/filter/lwpfont.cxx | 28 ---
lotuswordpro/source/filter/lwpfont.hxx | 4
lotuswordpro/source/filter/xfilter/xffontfactory.cxx | 6
solenv/gbuild/CppunitTest.mk | 2
svl/inc/svl/zforlist.hxx | 4
svl/source/numbers/zforlist.cxx | 22 --
svtools/inc/svtools/taskbar.hxx | 2
svtools/source/control/taskbar.cxx | 21 --
svx/inc/svx/galbrws.hxx | 1
svx/inc/svx/gallery.hxx | 7
svx/source/gallery2/galbrws.cxx | 7
svx/source/gallery2/galexpl.cxx | 67 --------
tools/inc/tools/fract.hxx | 1
tools/source/generic/fract.cxx | 45 -----
unusedcode.easy | 19 --
vcl/inc/vcl/msgbox.hxx | 3
vcl/source/window/msgbox.cxx | 15 -
21 files changed, 7 insertions(+), 456 deletions(-)
New commits:
commit 7c1a74b62ec33d6994445a7fb9d91088b3067316
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Oct 4 08:56:30 2011 +0100
regenerate list
diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx
index 047a4ca..cafaba9 100644
--- a/linguistic/source/lngopt.cxx
+++ b/linguistic/source/lngopt.cxx
@@ -99,25 +99,6 @@ LinguOptions::~LinguOptions()
}
}
-
-sal_Bool LinguOptions::SetLocale_Impl( sal_Int16 &rLanguage, Any &rOld, const Any &rVal, sal_Int16 nType)
-{
- sal_Bool bRes = sal_False;
-
- Locale aNew;
- rVal >>= aNew;
- sal_Int16 nNew = MsLangId::resolveSystemLanguageByScriptType(MsLangId::convertLocaleToLanguage(aNew), nType);
- if (nNew != rLanguage)
- {
- Locale aLocale( CreateLocale( rLanguage ) );
- rOld.setValue( &aLocale, ::getCppuType((Locale*)0 ));
- rLanguage = nNew;
- bRes = sal_True;
- }
-
- return bRes;
-}
-
struct WID_Name
{
sal_Int32 nWID;
diff --git a/linguistic/source/lngopt.hxx b/linguistic/source/lngopt.hxx
index f7d6948..1e0fa9f 100644
--- a/linguistic/source/lngopt.hxx
+++ b/linguistic/source/lngopt.hxx
@@ -68,12 +68,6 @@ class LinguOptions
static SvtLinguOptions *pData;
static oslInterlockedCount nRefCount; // number of objects of this class
- //! uses default assignment-operator
-
- sal_Bool SetLocale_Impl( sal_Int16 &rLanguage,
- ::com::sun::star::uno::Any &rOld,
- const ::com::sun::star::uno::Any &rVal, sal_Int16 nType );
-
public:
LinguOptions();
LinguOptions(const LinguOptions &rOpt);
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index a463b76..e75ce4d 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -41,7 +41,7 @@ gb_CppunitTest__interactive := $(true)
endif
ifneq ($(strip $(VALGRIND)),)
-gb_CppunitTest_VALGRINDTOOL := valgrind --tool=$(VALGRIND) --num-callers=50
+gb_CppunitTest_VALGRINDTOOL := valgrind --tool=$(VALGRIND) --num-callers=50 --leak-check=full
ifeq ($(strip $(VALGRIND)),memcheck)
G_SLICE := always-malloc
export G_SLICE
diff --git a/svx/inc/svx/galbrws.hxx b/svx/inc/svx/galbrws.hxx
index 1fd7c5e..2d9c20a 100644
--- a/svx/inc/svx/galbrws.hxx
+++ b/svx/inc/svx/galbrws.hxx
@@ -108,7 +108,6 @@ public:
INetURLObject GetURL() const;
String GetFilterName() const;
Graphic GetGraphic() const;
- sal_Bool GetVCDrawModel( FmFormModel& rModel ) const;
sal_Bool IsLinkage() const;
sal_Bool KeyInput( const KeyEvent& rKEvt, Window* pWindow );
diff --git a/svx/inc/svx/gallery.hxx b/svx/inc/svx/gallery.hxx
index a04659d..eb2b604 100644
--- a/svx/inc/svx/gallery.hxx
+++ b/svx/inc/svx/gallery.hxx
@@ -253,8 +253,6 @@ public:
Graphic* pGraphic = NULL, Bitmap* pThumb = NULL,
sal_Bool bProgess = sal_False );
- static sal_Bool InsertGraphicObj( const String& rThemeName, const Graphic& rGraphic );
-
static sal_uIntPtr GetSdrObjCount( const String& rThemeName );
static sal_uIntPtr GetSdrObjCount( sal_uIntPtr nThemeId );
@@ -263,8 +261,6 @@ public:
static sal_Bool GetSdrObj( sal_uIntPtr nThemeId, sal_uIntPtr nSdrModelPos,
SdrModel* pModel = NULL, Bitmap* pThumb = NULL );
- static sal_Bool InsertSdrObj( const String& rThemeName, FmFormModel& rModel );
-
static sal_Bool BeginLocking( const String& rThemeName );
static sal_Bool BeginLocking( sal_uIntPtr nThemeId );
diff --git a/svx/source/gallery2/galbrws.cxx b/svx/source/gallery2/galbrws.cxx
index ba95d07..ecae40d 100644
--- a/svx/source/gallery2/galbrws.cxx
+++ b/svx/source/gallery2/galbrws.cxx
@@ -263,13 +263,6 @@ Graphic GalleryBrowser::GetGraphic() const
// -----------------------------------------------------------------------------
-sal_Bool GalleryBrowser::GetVCDrawModel( FmFormModel& rModel ) const
-{
- return mpBrowser2->GetVCDrawModel( rModel );
-}
-
-// -----------------------------------------------------------------------------
-
sal_Bool GalleryBrowser::IsLinkage() const
{
return mpBrowser2->IsLinkage();
diff --git a/svx/source/gallery2/galexpl.cxx b/svx/source/gallery2/galexpl.cxx
index d5add09..a107ea8 100644
--- a/svx/source/gallery2/galexpl.cxx
+++ b/svx/source/gallery2/galexpl.cxx
@@ -300,28 +300,6 @@ sal_Bool GalleryExplorer::GetGraphicObj( sal_uIntPtr nThemeId, sal_uIntPtr nPos,
// ------------------------------------------------------------------------
-sal_Bool GalleryExplorer::InsertGraphicObj( const String& rThemeName, const Graphic& rGraphic )
-{
- Gallery* pGal = ImplGetGallery();
- sal_Bool bRet = sal_False;
-
- if( pGal )
- {
- SfxListener aListener;
- GalleryTheme* pTheme = pGal->AcquireTheme( rThemeName, aListener );
-
- if( pTheme )
- {
- bRet = pTheme->InsertGraphic( rGraphic );
- pGal->ReleaseTheme( pTheme, aListener );
- }
- }
-
- return bRet;
-}
-
-// ------------------------------------------------------------------------
-
sal_uIntPtr GalleryExplorer::GetSdrObjCount( const String& rThemeName )
{
Gallery* pGal = ImplGetGallery();
@@ -399,28 +377,6 @@ sal_Bool GalleryExplorer::GetSdrObj( sal_uIntPtr nThemeId, sal_uIntPtr nSdrModel
return( pGal ? GetSdrObj( pGal->GetThemeName( nThemeId ), nSdrModelPos, pModel, pThumb ) : sal_False );
}
-// ------------------------------------------------------------------------
-
-sal_Bool GalleryExplorer::InsertSdrObj( const String& rThemeName, FmFormModel& rModel )
-{
- Gallery* pGal = ImplGetGallery();
- sal_Bool bRet = sal_False;
-
- if( pGal )
- {
- SfxListener aListener;
- GalleryTheme* pTheme = pGal->AcquireTheme( rThemeName, aListener );
-
- if( pTheme )
- {
- bRet = pTheme->InsertModel( rModel );
- pGal->ReleaseTheme( pTheme, aListener );
- }
- }
-
- return bRet;
-}
-
// -----------------------------------------------------------------------------
sal_Bool GalleryExplorer::BeginLocking( const String& rThemeName )
diff --git a/unusedcode.easy b/unusedcode.easy
index 7a3b2d9..28ceb2b 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -732,6 +732,7 @@ SfxRequest::SetTarget(String const&)
SfxShell::GetBroadcaster()
SfxShell::RemoveItem(unsigned short)
SfxSlotPool::NextInterface()
+SfxStyleSheet::SfxStyleSheet()
SfxTabDialog::GetApplyHandler() const
SfxTabPage::SfxTabPage(Window*, long, SfxItemSet const&)
SfxThesSubMenuControl::RegisterControl(unsigned short, SfxModule*)
@@ -2019,6 +2020,9 @@ chelp::Databases::getInstallPathAsSystemPath()
cmis::Content::exchangeIdentity(com::sun::star::uno::Reference<com::sun::star::ucb::XContentIdentifier> const&)
cmis::Content::queryChildren(std::list<rtl::Reference<cmis::Content>, std::allocator<rtl::Reference<cmis::Content> > >&)
codemaker::cpp::typeToPrefix(TypeManager const&, rtl::OString const&)
+comphelper::AccessibleEventNotifier::getEventListeners(unsigned int)
+comphelper::AttributeList::AppendAttributeList(com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList> const&)
+comphelper::AttributeList::Clear()
comphelper::EmbeddedObjectContainer::CopyEmbeddedObject(comphelper::EmbeddedObjectContainer&, com::sun::star::uno::Reference<com::sun::star::embed::XEmbeddedObject> const&, rtl::OUString&)
comphelper::EventLogger::addLogHandler(com::sun::star::uno::Reference<com::sun::star::logging::XLogHandler> const&)
comphelper::EventLogger::getLogLevel() const
commit 7d31a252b12b619a91ac8711b64d0968e055e1fb
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Oct 3 22:22:56 2011 +0100
no need to continue, delete NULL is safe
diff --git a/lotuswordpro/source/filter/xfilter/xffontfactory.cxx b/lotuswordpro/source/filter/xfilter/xffontfactory.cxx
index 72b6387..82be04c 100644
--- a/lotuswordpro/source/filter/xfilter/xffontfactory.cxx
+++ b/lotuswordpro/source/filter/xfilter/xffontfactory.cxx
@@ -68,20 +68,18 @@ XFFontFactory::~XFFontFactory()
Reset();
}
-void XFFontFactory::Reset()
+void XFFontFactory::Reset()
{
std::vector<XFFont*>::iterator it;
for( it = s_aFonts.begin(); it != s_aFonts.end(); ++it )
{
XFFont *pFont = (*it);
- if( !pFont )
- continue;
delete pFont;
}
s_aFonts.clear();
}
-void XFFontFactory::AddFont(XFFont *pFont)
+void XFFontFactory::AddFont(XFFont *pFont)
{
s_aFonts.push_back( pFont );
}
commit 3ad0070790b86c099ac9ccf8013ed7c619cf0a3c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Oct 3 22:16:11 2011 +0100
SetDfltFont doesn't do anything
diff --git a/lotuswordpro/source/filter/lwpfont.cxx b/lotuswordpro/source/filter/lwpfont.cxx
index 87f279d..01b1e2d 100644
--- a/lotuswordpro/source/filter/lwpfont.cxx
+++ b/lotuswordpro/source/filter/lwpfont.cxx
@@ -481,7 +481,6 @@ Create XFFont based on the fotID
XFFont* LwpFontManager::CreateFont(sal_uInt32 fontID)
{
XFFont* pFont = new XFFont();
- SetDfltFont(pFont);
m_FNMgr.Override(GetFontNameIndex(fontID), pFont);
m_AttrMgr.Override(GetFontAttrIndex(fontID), pFont);
return pFont;
@@ -495,7 +494,6 @@ Refer to CFontManager::OverrideID
XFFont* LwpFontManager::CreateOverrideFont(sal_uInt32 fontID, sal_uInt32 overID)
{
XFFont* pFont = new XFFont(); //To be deleted by XFFontFactory
- SetDfltFont(pFont);
if(fontID)
{
Override(fontID, pFont);
@@ -513,32 +511,6 @@ void LwpFontManager::Override(sal_uInt32 fontID, XFFont* pFont)
m_AttrMgr.Override(GetFontAttrIndex(fontID), pFont);
}
-
-/*
-Called by VO_PARA to get style name based on the Para Style ID
-1) Get style from LwpParaStyleMap based on the LwpObjectID of VO_PARASTYLE.
-2) Prerequisite: VO_PARASTYLE should call AddStyle first.
-3) Return empty string if no style found.
-//To be replaced by OUString LwpStyleManager::GetStyle(const LwpObjectID &styleID)
-*/
-/*OUString LwpFontManager::GetParaStyle(const LwpObjectID &styleID)
-{
- LwpParaStyleMap::const_iterator it = m_StyleList.find(styleID);
- if (it != m_StyleList.end()) {
- return((*it).second);
- }
- return OUString();
-}*/
-
-void LwpFontManager::SetDfltFont(XFFont* /*pFont*/)
-{
- // TODO: Set default XFFont values in lwp filter
- //color:black, background color: transparent, Orientation: left to right, top to bottom, others: 0
- //Refer to CFontDescription::CFontDescription(void)
- //Did not find anything special
- //pFont->SetColor(XFColor(0,0,0));
-}
-
OUString LwpFontManager::GetNameByID(sal_uInt32 fontID)
{
return ( m_FNMgr.GetNameByIndex(GetFontNameIndex(fontID)) );//use font id for bullet?
diff --git a/lotuswordpro/source/filter/lwpfont.hxx b/lotuswordpro/source/filter/lwpfont.hxx
index 5ed2142..7cf5da1 100644
--- a/lotuswordpro/source/filter/lwpfont.hxx
+++ b/lotuswordpro/source/filter/lwpfont.hxx
@@ -260,15 +260,11 @@ public:
XFFont* CreateOverrideFont(sal_uInt32 fontID, sal_uInt32 overID);
XFFont* CreateFont(sal_uInt32 fontID);
OUString GetNameByID(sal_uInt32 fontID);
- //void AddStyle(LwpObjectID styleObjID, sal_uInt32 fontID, OUString styleName);
- //void AddStyle(LwpObjectID styleObjID, sal_uInt32 fontID, OUString styleName, XFTextStyle* pStyle);
- //OUString GetOverrideStyle(sal_uInt32 fontID, sal_uInt32 overID);
private:
void Override(sal_uInt32 fontID, XFFont* pFont);
inline sal_uInt16 GetFontNameIndex(sal_uInt32 fontID);
inline sal_uInt16 GetFontAttrIndex(sal_uInt32 fontID);
- void SetDfltFont(XFFont* pFont);
};
sal_uInt16 LwpFontManager::GetFontNameIndex(sal_uInt32 fontID)
commit 04723baf6e87fb8d3c097f41529e388bf48df43c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Oct 3 21:40:06 2011 +0100
callcatcher: various unused methods
diff --git a/editeng/inc/editeng/editeng.hxx b/editeng/inc/editeng/editeng.hxx
index 5ab7c23..0db0464 100644
--- a/editeng/inc/editeng/editeng.hxx
+++ b/editeng/inc/editeng/editeng.hxx
@@ -227,10 +227,6 @@ public:
String GetWord( sal_uInt16 nPara, xub_StrLen nIndex );
ESelection GetWord( const ESelection& rSelection, sal_uInt16 nWordType ) const;
- ESelection WordLeft( const ESelection& rSelection, sal_uInt16 nWordType ) const;
- ESelection WordRight( const ESelection& rSelection, sal_uInt16 nWordType ) const;
- ESelection CursorLeft( const ESelection& rSelection, sal_uInt16 nCharacterIteratorMode ) const;
- ESelection CursorRight( const ESelection& rSelection, sal_uInt16 nCharacterIteratorMode ) const;
ESelection SelectSentence( const ESelection& rCurSel ) const;
void Clear();
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 97cfc74..5d745c0 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -751,46 +751,6 @@ ESelection EditEngine::GetWord( const ESelection& rSelection, sal_uInt16 nWordTy
return pE->pImpEditEngine->CreateESel( aSel );
}
-ESelection EditEngine::WordLeft( const ESelection& rSelection, sal_uInt16 nWordType ) const
-{
- // ImpEditEngine-Iteration-Methods should be const!
- EditEngine* pE = (EditEngine*)this;
-
- EditSelection aSel( pE->pImpEditEngine->CreateSel( rSelection ) );
- aSel = pE->pImpEditEngine->WordLeft( aSel.Min(), nWordType );
- return pE->pImpEditEngine->CreateESel( aSel );
-}
-
-ESelection EditEngine::WordRight( const ESelection& rSelection, sal_uInt16 nWordType ) const
-{
- // ImpEditEngine-Iteration-Methods should be const!
- EditEngine* pE = (EditEngine*)this;
-
- EditSelection aSel( pE->pImpEditEngine->CreateSel( rSelection ) );
- aSel = pE->pImpEditEngine->WordRight( aSel.Max(), nWordType );
- return pE->pImpEditEngine->CreateESel( aSel );
-}
-
-ESelection EditEngine::CursorLeft( const ESelection& rSelection, sal_uInt16 nCharacterIteratorMode ) const
-{
- // ImpEditEngine-Iteration-Methods should be const!
- EditEngine* pE = (EditEngine*)this;
-
- EditSelection aSel( pE->pImpEditEngine->CreateSel( rSelection ) );
- aSel = pE->pImpEditEngine->CursorLeft( aSel.Min(), nCharacterIteratorMode );
- return pE->pImpEditEngine->CreateESel( aSel );
-}
-
-ESelection EditEngine::CursorRight( const ESelection& rSelection, sal_uInt16 nCharacterIteratorMode ) const
-{
- // ImpEditEngine-Iteration-Methods should be const!
- EditEngine* pE = (EditEngine*)this;
-
- EditSelection aSel( pE->pImpEditEngine->CreateSel( rSelection ) );
- aSel = pE->pImpEditEngine->CursorRight( aSel.Max(), nCharacterIteratorMode );
- return pE->pImpEditEngine->CreateESel( aSel );
-}
-
ESelection EditEngine::SelectSentence( const ESelection& rCurSel ) const
{
EditEngine* pE = (EditEngine*)this;
diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx
index b7b2f15..047a4ca 100644
--- a/linguistic/source/lngopt.cxx
+++ b/linguistic/source/lngopt.cxx
@@ -118,142 +118,6 @@ sal_Bool LinguOptions::SetLocale_Impl( sal_Int16 &rLanguage, Any &rOld, const An
return bRes;
}
-
-sal_Bool LinguOptions::SetValue( Any &rOld, const Any &rVal, sal_Int32 nWID )
-{
- MutexGuard aGuard( GetLinguMutex() );
-
- sal_Bool bRes = sal_False;
-
- sal_Int16 *pnVal = 0;
- sal_Bool *pbVal = 0;
-
- switch( nWID )
- {
- case WID_IS_GERMAN_PRE_REFORM : /*! deprecated !*/ break;
- case WID_IS_USE_DICTIONARY_LIST : pbVal = &pData->bIsUseDictionaryList; break;
- case WID_IS_IGNORE_CONTROL_CHARACTERS : pbVal = &pData->bIsIgnoreControlCharacters; break;
- case WID_IS_HYPH_AUTO : pbVal = &pData->bIsHyphAuto; break;
- case WID_IS_HYPH_SPECIAL : pbVal = &pData->bIsHyphSpecial; break;
- case WID_IS_SPELL_AUTO : pbVal = &pData->bIsSpellAuto; break;
- case WID_IS_SPELL_HIDE : /*! deprecated !*/ break;
- case WID_IS_SPELL_IN_ALL_LANGUAGES :/*! deprecated !*/ break;
- case WID_IS_SPELL_SPECIAL : pbVal = &pData->bIsSpellSpecial; break;
- case WID_IS_WRAP_REVERSE : pbVal = &pData->bIsSpellReverse; break;
- case WID_DEFAULT_LANGUAGE : pnVal = &pData->nDefaultLanguage; break;
- case WID_IS_SPELL_CAPITALIZATION : pbVal = &pData->bIsSpellCapitalization; break;
- case WID_IS_SPELL_WITH_DIGITS : pbVal = &pData->bIsSpellWithDigits; break;
- case WID_IS_SPELL_UPPER_CASE : pbVal = &pData->bIsSpellUpperCase; break;
- case WID_HYPH_MIN_LEADING : pnVal = &pData->nHyphMinLeading; break;
- case WID_HYPH_MIN_TRAILING : pnVal = &pData->nHyphMinTrailing; break;
- case WID_HYPH_MIN_WORD_LENGTH : pnVal = &pData->nHyphMinWordLength; break;
- case WID_DEFAULT_LOCALE :
- {
- bRes = SetLocale_Impl( pData->nDefaultLanguage, rOld, rVal, ::com::sun::star::i18n::ScriptType::LATIN );
- break;
- }
- case WID_DEFAULT_LOCALE_CJK :
- {
- bRes = SetLocale_Impl( pData->nDefaultLanguage_CJK, rOld, rVal, ::com::sun::star::i18n::ScriptType::ASIAN );
- break;
- }
- case WID_DEFAULT_LOCALE_CTL :
- {
- bRes = SetLocale_Impl( pData->nDefaultLanguage_CTL, rOld, rVal, ::com::sun::star::i18n::ScriptType::COMPLEX );
- break;
- }
- default :
- {
- DBG_ASSERT( 0,"lng : unknown WID");
- bRes = sal_False;
- }
- }
-
- if (pbVal)
- {
- sal_Bool bNew = sal_False;
- rVal >>= bNew;
- if (bNew != *pbVal)
- {
- rOld <<= *pbVal;
- *pbVal = bNew;
- bRes = sal_True;
- }
- }
- if (pnVal)
- {
- sal_Int16 nNew = 0;
- rVal >>= nNew;
- if (nNew != *pnVal)
- {
- rOld <<= *pnVal;
- *pnVal = nNew;
- bRes = sal_True;
- }
- }
-
-
- return bRes;
-}
-
-void LinguOptions::GetValue( Any &rVal, sal_Int32 nWID ) const
-{
- MutexGuard aGuard( GetLinguMutex() );
-
- sal_Int16 *pnVal = 0;
- sal_Bool *pbVal = 0;
- sal_Bool bDummy = sal_False;
-
- switch( nWID )
- {
- case WID_IS_GERMAN_PRE_REFORM : pbVal = &bDummy; /*! deprecated !*/ break;
- case WID_IS_USE_DICTIONARY_LIST : pbVal = &pData->bIsUseDictionaryList; break;
- case WID_IS_IGNORE_CONTROL_CHARACTERS : pbVal = &pData->bIsIgnoreControlCharacters; break;
- case WID_IS_HYPH_AUTO : pbVal = &pData->bIsHyphAuto; break;
- case WID_IS_HYPH_SPECIAL : pbVal = &pData->bIsHyphSpecial; break;
- case WID_IS_SPELL_AUTO : pbVal = &pData->bIsSpellAuto; break;
- case WID_IS_SPELL_HIDE : pbVal = &bDummy; /*! deprecated !*/ break;
- case WID_IS_SPELL_IN_ALL_LANGUAGES :pbVal = &bDummy; /*! deprecated !*/ break;
- case WID_IS_SPELL_SPECIAL : pbVal = &pData->bIsSpellSpecial; break;
- case WID_IS_WRAP_REVERSE : pbVal = &pData->bIsSpellReverse; break;
- case WID_DEFAULT_LANGUAGE : pnVal = &pData->nDefaultLanguage; break;
- case WID_IS_SPELL_CAPITALIZATION : pbVal = &pData->bIsSpellCapitalization; break;
- case WID_IS_SPELL_WITH_DIGITS : pbVal = &pData->bIsSpellWithDigits; break;
- case WID_IS_SPELL_UPPER_CASE : pbVal = &pData->bIsSpellUpperCase; break;
- case WID_HYPH_MIN_LEADING : pnVal = &pData->nHyphMinLeading; break;
- case WID_HYPH_MIN_TRAILING : pnVal = &pData->nHyphMinTrailing; break;
- case WID_HYPH_MIN_WORD_LENGTH : pnVal = &pData->nHyphMinWordLength; break;
- case WID_DEFAULT_LOCALE :
- {
- Locale aLocale( MsLangId::convertLanguageToLocale( pData->nDefaultLanguage ) );
- rVal.setValue( &aLocale, ::getCppuType((Locale*)0 ));
- break;
- }
- case WID_DEFAULT_LOCALE_CJK :
- {
- Locale aLocale( MsLangId::convertLanguageToLocale( pData->nDefaultLanguage_CJK ) );
- rVal.setValue( &aLocale, ::getCppuType((Locale*)0 ));
- break;
- }
- case WID_DEFAULT_LOCALE_CTL :
- {
- Locale aLocale( MsLangId::convertLanguageToLocale( pData->nDefaultLanguage_CTL ) );
- rVal.setValue( &aLocale, ::getCppuType((Locale*)0 ));
- break;
- }
- default :
- {
- DBG_ASSERT( 0,"lng : unknown WID");
- }
- }
-
- if (pbVal)
- rVal <<= *pbVal;
- if (pnVal)
- rVal <<= *pnVal;
-}
-
-
struct WID_Name
{
sal_Int32 nWID;
diff --git a/linguistic/source/lngopt.hxx b/linguistic/source/lngopt.hxx
index d0e8ae5..f7d6948 100644
--- a/linguistic/source/lngopt.hxx
+++ b/linguistic/source/lngopt.hxx
@@ -79,10 +79,6 @@ public:
LinguOptions(const LinguOptions &rOpt);
~LinguOptions();
- sal_Bool SetValue( ::com::sun::star::uno::Any &rOld,
- const ::com::sun::star::uno::Any &rVal, sal_Int32 nWID );
- void GetValue( ::com::sun::star::uno::Any &rVal, sal_Int32 nWID ) const;
-
static ::rtl::OUString GetName( sal_Int32 nWID );
const ::com::sun::star::uno::Sequence< rtl::OUString >
diff --git a/svl/inc/svl/zforlist.hxx b/svl/inc/svl/zforlist.hxx
index c27f779..67a1678 100644
--- a/svl/inc/svl/zforlist.hxx
+++ b/svl/inc/svl/zforlist.hxx
@@ -266,10 +266,6 @@ public:
/// Symbols and language identical
bool operator==( const NfCurrencyEntry& r ) const;
- /// Set this format to be the EURo entry, overwrite other settings
- void SetEuro();
- bool IsEuro() const;
-
/** Apply format information (nPositiveFormat,
nNegativeFormat, nDigits, cZeroChar) of another format. */
void ApplyVariableInformation( const NfCurrencyEntry& );
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 5bbaf8f..8ce8eef 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -3823,28 +3823,6 @@ bool NfCurrencyEntry::operator==( const NfCurrencyEntry& r ) const
;
}
-
-void NfCurrencyEntry::SetEuro()
-{
- aSymbol = NfCurrencyEntry::GetEuroSymbol();
- aBankSymbol.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "EUR" ) );
- eLanguage = LANGUAGE_DONTKNOW;
- nPositiveFormat = 3;
- nNegativeFormat = 8;
- nDigits = 2;
- cZeroChar = '0';
-}
-
-
-bool NfCurrencyEntry::IsEuro() const
-{
- if ( aBankSymbol.EqualsAscii( "EUR" ) )
- return true;
- String aEuro( NfCurrencyEntry::GetEuroSymbol() );
- return aSymbol == aEuro;
-}
-
-
void NfCurrencyEntry::ApplyVariableInformation( const NfCurrencyEntry& r )
{
nPositiveFormat = r.nPositiveFormat;
diff --git a/svtools/inc/svtools/taskbar.hxx b/svtools/inc/svtools/taskbar.hxx
index d844c02..144a690 100644
--- a/svtools/inc/svtools/taskbar.hxx
+++ b/svtools/inc/svtools/taskbar.hxx
@@ -37,7 +37,6 @@
class TaskBar;
class TaskStatusFieldItem;
-class ImplTaskBarFloat;
struct ImplTaskSBFldItem;
struct ImplTaskItem;
@@ -335,7 +334,6 @@ public:
class SVT_DLLPUBLIC TaskBar : public Window
{
private:
- ImplTaskBarFloat* mpAutoHideBar;
TaskButtonBar* mpButtonBar;
TaskToolBox* mpTaskToolBox;
TaskStatusBar* mpStatusBar;
diff --git a/svtools/source/control/taskbar.cxx b/svtools/source/control/taskbar.cxx
index a41730c..3d15ae9 100644
--- a/svtools/source/control/taskbar.cxx
+++ b/svtools/source/control/taskbar.cxx
@@ -36,27 +36,6 @@
#include <svtools/taskbar.hxx>
-// =======================================================================
-
-class ImplTaskBarFloat : public FloatingWindow
-{
-public:
- TaskBar* mpTaskBar;
-
-public:
- ImplTaskBarFloat( TaskBar* pTaskBar );
-};
-
-// -----------------------------------------------------------------------
-
-ImplTaskBarFloat::ImplTaskBarFloat( TaskBar* pTaskBar ) :
- FloatingWindow( pTaskBar, 0 )
-{
- mpTaskBar = pTaskBar;
-}
-
-// =======================================================================
-
#define TASKBAR_BORDER 2
#define TASKBAR_OFFSIZE 3
#define TASKBAR_OFFX 2
diff --git a/svx/inc/svx/gallery.hxx b/svx/inc/svx/gallery.hxx
index bb7b9ab..a04659d 100644
--- a/svx/inc/svx/gallery.hxx
+++ b/svx/inc/svx/gallery.hxx
@@ -224,7 +224,6 @@ public:
INetURLObject GetURL() const;
String GetFilterName() const;
Graphic GetGraphic() const;
- sal_Bool GetVCDrawModel( FmFormModel& rModel ) const;
sal_Bool IsLinkage() const;
static bool FillThemeList( std::vector<String>& rThemeList );
@@ -255,7 +254,6 @@ public:
sal_Bool bProgess = sal_False );
static sal_Bool InsertGraphicObj( const String& rThemeName, const Graphic& rGraphic );
- static sal_Bool InsertGraphicObj( sal_uIntPtr nThemeId, const Graphic& rGraphic );
static sal_uIntPtr GetSdrObjCount( const String& rThemeName );
static sal_uIntPtr GetSdrObjCount( sal_uIntPtr nThemeId );
@@ -266,7 +264,6 @@ public:
SdrModel* pModel = NULL, Bitmap* pThumb = NULL );
static sal_Bool InsertSdrObj( const String& rThemeName, FmFormModel& rModel );
- static sal_Bool InsertSdrObj( sal_uIntPtr nThemeId, FmFormModel& rModel );
static sal_Bool BeginLocking( const String& rThemeName );
static sal_Bool BeginLocking( sal_uIntPtr nThemeId );
diff --git a/svx/source/gallery2/galexpl.cxx b/svx/source/gallery2/galexpl.cxx
index a813ffe..d5add09 100644
--- a/svx/source/gallery2/galexpl.cxx
+++ b/svx/source/gallery2/galexpl.cxx
@@ -95,13 +95,6 @@ Graphic GalleryExplorer::GetGraphic() const
// ------------------------------------------------------------------------
-sal_Bool GalleryExplorer::GetVCDrawModel( FmFormModel& rModel ) const
-{
- return GALLERYBROWSER()->GetVCDrawModel( rModel );
-}
-
-// ------------------------------------------------------------------------
-
sal_Bool GalleryExplorer::IsLinkage() const
{
return GALLERYBROWSER()->IsLinkage();
@@ -329,14 +322,6 @@ sal_Bool GalleryExplorer::InsertGraphicObj( const String& rThemeName, const Grap
// ------------------------------------------------------------------------
-sal_Bool GalleryExplorer::InsertGraphicObj( sal_uIntPtr nThemeId, const Graphic& rGraphic )
-{
- Gallery* pGal = ImplGetGallery();
- return( pGal ? InsertGraphicObj( pGal->GetThemeName( nThemeId ), rGraphic ) : sal_False );
-}
-
-// ------------------------------------------------------------------------
-
sal_uIntPtr GalleryExplorer::GetSdrObjCount( const String& rThemeName )
{
Gallery* pGal = ImplGetGallery();
@@ -436,14 +421,6 @@ sal_Bool GalleryExplorer::InsertSdrObj( const String& rThemeName, FmFormModel& r
return bRet;
}
-// ------------------------------------------------------------------------
-
-sal_Bool GalleryExplorer::InsertSdrObj( sal_uIntPtr nThemeId, FmFormModel& rModel )
-{
- Gallery* pGal = ImplGetGallery();
- return( pGal ? InsertSdrObj( pGal->GetThemeName( nThemeId ), rModel ) : sal_False );
-}
-
// -----------------------------------------------------------------------------
sal_Bool GalleryExplorer::BeginLocking( const String& rThemeName )
diff --git a/tools/inc/tools/fract.hxx b/tools/inc/tools/fract.hxx
index 1e9f67a..f0fa7e9 100644
--- a/tools/inc/tools/fract.hxx
+++ b/tools/inc/tools/fract.hxx
@@ -46,7 +46,6 @@ public:
Fraction() { nNumerator = 0; nDenominator = 1; }
Fraction( const Fraction & rFrac );
Fraction( long nNum, long nDen=1 );
- Fraction( long nN1, long nN2, long nD1, long nD2 );
Fraction( double dVal );
bool IsValid() const;
diff --git a/tools/source/generic/fract.cxx b/tools/source/generic/fract.cxx
index 104662b..dfa6fb7 100644
--- a/tools/source/generic/fract.cxx
+++ b/tools/source/generic/fract.cxx
@@ -128,51 +128,6 @@ static void Reduce( BigInt &rVal1, BigInt &rVal2 )
|*
*************************************************************************/
-Fraction::Fraction( long nN1, long nN2, long nD1, long nD2 )
-{
- long n;
- int i = 1;
-
- if( nN1 < 0 ) { i = -i; nN1 = -nN1; }
- if( nN2 < 0 ) { i = -i; nN2 = -nN2; }
- if( nD1 < 0 ) { i = -i; nD1 = -nD1; }
- if( nD2 < 0 ) { i = -i; nD2 = -nD2; }
-
- n = GetGGT( nN1, nD1 ); if( n > 1 ) { nN1 /= n; nD1 /= n; }
- n = GetGGT( nN1, nD2 ); if( n > 1 ) { nN1 /= n; nD2 /= n; }
- n = GetGGT( nN2, nD1 ); if( n > 1 ) { nN2 /= n; nD1 /= n; }
- n = GetGGT( nN2, nD2 ); if( n > 1 ) { nN2 /= n; nD2 /= n; }
-
- BigInt nN( nN1 );
- nN *= BigInt( nN2 );
-
- BigInt nD( nD1 );
- nD *= BigInt( nD2 );
-
- while ( nN.bIsBig || nD.bIsBig )
- {
- BigInt n1 = 1;
- BigInt n2 = 2;
-
- nN += n1;
- nN /= n2;
- nD += n1;
- nD /= n2;
-
- // Kuerzen ueber Groesste Gemeinsame Teiler
- Reduce( nN, nD );
- }
-
- nNumerator = i * (long)nN;
- nDenominator = (long)nD;
-}
-
-/*************************************************************************
-|*
-|* Fraction::Fraction()
-|*
-*************************************************************************/
-
// Zur Initialisierung eines Bruches wird nNum dem Zaehler und nDen dem
// Nenner zugewiesen. Da negative Werte des Nenners einen Bruch als
// ungueltig kennzeichnen, wird bei der Eingabe eines negativen Nenners
diff --git a/unusedcode.easy b/unusedcode.easy
index 751a571..7a3b2d9 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -111,8 +111,6 @@ EECharAttribArray::Insert(EECharAttribArray const*, unsigned short, unsigned sho
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*)
-EditEngine::CursorLeft(ESelection const&, unsigned short) const
-EditEngine::CursorRight(ESelection const&, unsigned short) const
EditEngine::EnablePasteSpecial(unsigned char)
EditEngine::EndSpelling()
EditEngine::GetAsianCompressionMode() const
@@ -138,8 +136,6 @@ EditEngine::SetBigTextObjectStart(unsigned short)
EditEngine::SetGroupChars(String const&)
EditEngine::SetText(unsigned short, EditTextObject const&)
EditEngine::StopSelectionMode()
-EditEngine::WordLeft(ESelection const&, unsigned short) const
-EditEngine::WordRight(ESelection const&, unsigned short) const
EditView::Drop(DropEvent const&)
EditView::GetDropPos()
EditView::GetSelectionMode() const
@@ -178,7 +174,6 @@ FontStyleMenu::Fill(String const&, FontList const*)
FontStyleMenu::FontStyleMenu()
FormattedField::SetValidateText(String const&, String const*)
FormatterBase::SetFieldText(String const&, unsigned char)
-Fraction::Fraction(long, long, long, long)
GDIMetaFile::CopyAction(unsigned long) const
GDIMetaFile::GetActionPos(String const&)
GDIMetaFile::GetLabel(unsigned long)
@@ -194,9 +189,6 @@ GDIMetaFile::WindEnd()
GDIMetaFile::WindNext()
GalleryExplorer::DrawCentered(OutputDevice*, FmFormModel const&)
GalleryExplorer::GetObjCount(unsigned long)
-GalleryExplorer::GetVCDrawModel(FmFormModel&) const
-GalleryExplorer::InsertGraphicObj(unsigned long, Graphic const&)
-GalleryExplorer::InsertSdrObj(unsigned long, FmFormModel&)
GraphCtrl::GraphCtrl(Window*, long)
Graphic::Draw(OutputDevice*, String const&, Font&, Bitmap const&, Point const&, Size const&)
Graphic::GetGraphicsCompressMode(SvStream&)
@@ -237,7 +229,6 @@ ImplImageList::GetImageCount() const
ImplListBox::GetEntryFlags(unsigned short) const
ImplRegionBand::IsInside(long, long)
ImplRegionBand::IsOver(long, long)
-ImplTaskBarFloat::ImplTaskBarFloat(TaskBar*)
ImplWin::GetModeImage() const
ImplWin::SetModeImage(Image const&)
IniParser::Dump()
@@ -261,8 +252,6 @@ LineListBox::GetEntryDistance(unsigned short) const
LineListBox::GetEntryLine1(unsigned short) const
LineListBox::GetEntryLine2(unsigned short) const
LinguMgr::UpdateAll()
-LinguOptions::GetValue(com::sun::star::uno::Any&, int) const
-LinguOptions::SetValue(com::sun::star::uno::Any&, com::sun::star::uno::Any const&, int)
LinkStructArr::DeleteAndDestroy(unsigned short, unsigned short)
LngSvcMgr::RemoveLngSvcEvtBroadcaster(com::sun::star::uno::Reference<com::sun::star::linguistic2::XLinguServiceEventBroadcaster> const&)
LocaleDataWrapper::getCollatorImplementations() const
@@ -292,10 +281,8 @@ Matrix3d::Inverse() const
Matrix3d::Matrix3d()
MergeData::~MergeData()
MergeDataFile::Dump()
-MessBox::GetModeImage() const
MessBox::MessBox(unsigned short)
MessBox::SetDefaultCheckBoxText()
-MessBox::SetModeImage(Image const&)
MetaCommentAction::MetaCommentAction(unsigned char const*, unsigned int)
MetricBox::RemoveValue(long, FieldUnit)
MetricField::ConvertValue(long, unsigned short, FieldUnit, MapUnit)
@@ -313,9 +300,7 @@ MultiSelection::PrevSelected()
NameNode::IsOrderTree() const
NativeNumberWrapper::isValidNatNum(com::sun::star::lang::Locale const&, short) const
NfCurrencyEntry::ApplyVariableInformation(NfCurrencyEntry const&)
-NfCurrencyEntry::IsEuro() const
NfCurrencyEntry::NfCurrencyEntry()
-NfCurrencyEntry::SetEuro()
NfShCurrencyEntries::DeleteAndDestroy(unsigned short, unsigned short)
NotificationSettings::CopyData()
NotifyBrokenPackage::isAborted()
diff --git a/vcl/inc/vcl/msgbox.hxx b/vcl/inc/vcl/msgbox.hxx
index 326dae5..bc8bf8e 100644
--- a/vcl/inc/vcl/msgbox.hxx
+++ b/vcl/inc/vcl/msgbox.hxx
@@ -100,9 +100,6 @@ public:
void SetImage( const Image& rImage ) { maImage = rImage; }
const Image& GetImage() const { return maImage; }
- sal_Bool SetModeImage( const Image& rImage );
- const Image& GetModeImage( ) const;
-
void SetDefaultCheckBoxText();
void SetCheckBoxText( const XubString& rText ) { maCheckBoxText = rText;}
const XubString& GetCheckBoxText() const { return maCheckBoxText;}
diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx
index e27cefe..bc32832 100644
--- a/vcl/source/window/msgbox.cxx
+++ b/vcl/source/window/msgbox.cxx
@@ -459,21 +459,6 @@ void MessBox::SetDefaultCheckBoxText()
// -----------------------------------------------------------------------
-sal_Bool MessBox::SetModeImage( const Image& rImage )
-{
- SetImage( rImage );
- return sal_True;
-}
-
-// -----------------------------------------------------------------------
-
-const Image& MessBox::GetModeImage( ) const
-{
- return maImage;
-}
-
-// -----------------------------------------------------------------------
-
Size MessBox::GetOptimalSize(WindowSizeType eType) const
{
switch( eType ) {
More information about the Libreoffice-commits
mailing list