[Libreoffice-commits] .: 3 commits - sw/source unotools/inc unotools/source unusedcode.easy vcl/inc vcl/source
Caolán McNamara
caolan at kemper.freedesktop.org
Wed Nov 2 09:04:52 PDT 2011
sw/source/ui/wrtsh/select.cxx | 23 ++++++++++++++++-------
unotools/inc/unotools/lingucfg.hxx | 1 -
unotools/source/config/lingucfg.cxx | 15 ---------------
unusedcode.easy | 36 ++++++++++++++++++++++++++++++++++--
vcl/inc/vcl/button.hxx | 1 -
vcl/source/control/button.cxx | 6 ------
6 files changed, 50 insertions(+), 32 deletions(-)
New commits:
commit 8fa8a59cad3970bbe68724fbbb93797fb5786c37
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Nov 2 16:03:57 2011 +0000
update unused list
diff --git a/unusedcode.easy b/unusedcode.easy
index a8cece3..e895bbc 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -487,8 +487,6 @@ ScInputBarGroup::LinkStubImpl_ScrollHdl(void*, void*)
ScJobSetup::ScJobSetup(SfxPrinter*)
ScLeftFooterEditPage::GetRanges()
ScLeftHeaderEditPage::GetRanges()
-ScMacrosTest::testStarBasic()
-ScMacrosTest::testVba()
ScMatrix::CalcOffset(unsigned long, unsigned long) const
ScMultiTextWnd::GetLineCount()
ScMyCellInfo::ScMyCellInfo()
@@ -1269,6 +1267,7 @@ VCLUnoHelper::CreatePointer()
VCLXDevice::IsCreatedWithToolkit() const
VCLXPrinterServer::getImplementationId()
VCLXPrinterServer::getTypes()
+VCLXRadioButton::getFirstActionListener()
VbaFontBase::getUnderline()
VbaFontBase::setUnderline(com::sun::star::uno::Any const&)
VbaFoundFilesEnum::SetFileList(com::sun::star::uno::Sequence<rtl::OUString>&)
@@ -2136,7 +2135,40 @@ graphite2::TtfUtil::GlyfLookup(unsigned short, void const*, void const*, unsigne
jfw_plugin::VendorBase::createInstance()
jfw_plugin::VendorBase::getJavaExePaths(int*)
jvmaccess::ClassPath::doLoadClass(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, void*, rtl::OUString const&, rtl::OUString const&)
+layout::Box::Box(layout::Context const*, char const*)
+layout::Box::Box(rtl::OUString const&, int, bool)
+layout::Box::setProps(com::sun::star::uno::Reference<com::sun::star::awt::XLayoutConstrains>, bool, bool, int)
+layout::Button::GetButton() const
+layout::Container::ShowAll(bool)
+layout::ControlImpl::GetGetFocusHdl()
+layout::ControlImpl::GetLoseFocusHdl()
+layout::Dialog::GetDialog() const
+layout::Edit::GetEdit() const
+layout::ErrorBox::ErrorBox(Window*, char const*, char const*, char const*, rtl::OString const&, char const*, char const*)
+layout::ErrorBox::ErrorBox(Window*, long, char const*, char const*, char const*, rtl::OString const&, char const*, char const*)
+layout::ErrorBox::ErrorBox(Window*, long, rtl::OUString const&, rtl::OUString, rtl::OUString, rtl::OString const&, char const*, char const*)
+layout::ErrorBox::ErrorBox(Window*, rtl::OUString const&, rtl::OUString, rtl::OUString, rtl::OString const&, char const*, char const*)
+layout::InfoBox::InfoBox(Window*, char const*, char const*, char const*, rtl::OString const&, char const*, char const*)
+layout::InfoBox::InfoBox(Window*, long, char const*, char const*, char const*, rtl::OString const&, char const*, char const*)
+layout::InfoBox::InfoBox(Window*, long, rtl::OUString const&, rtl::OUString, rtl::OUString, rtl::OString const&, char const*, char const*)
+layout::InfoBox::InfoBox(Window*, rtl::OUString const&, rtl::OUString, rtl::OUString, rtl::OString const&, char const*, char const*)
+layout::ListBox::GetEntry(unsigned short) const
+layout::ListBox::GetEntryPos(String const&) const
+layout::ListBox::GetSelectEntryPos(unsigned short) const
+layout::ListBox::SelectEntryPos(unsigned short, bool)
+layout::MetricFormatter::MetricFormatter(layout::FormatterBaseImpl*)
+layout::MetricFormatter::getFormatImpl() const
+layout::NumericFormatter::NumericFormatter(layout::FormatterBaseImpl*)
+layout::NumericFormatter::getFormatImpl() const
+layout::PushButton::Check(bool)
+layout::PushButton::GetPushButton() const
+layout::TabControl::SetCurPageId(unsigned short)
+layout::Table::setProps(com::sun::star::uno::Reference<com::sun::star::awt::XLayoutConstrains>, bool, bool, int, int)
+layout::Window::CreatePeer(layout::Window*, long, char const*)
+layout::Window::getContext()
+layout::WindowImpl::getProperty(char const*)
layoutimpl::LayoutRoot::addItem(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::awt::XLayoutConstrains> const&)
+layoutimpl::VCLXPlugin::SetPlugin(Control*)
layoutimpl::VCLXTabControl::AddChild(com::sun::star::uno::Reference<com::sun::star::awt::XLayoutConstrains> const&)
layoutimpl::WidgetFactory::sfx2CreateWindow(VCLXWindow**, Window*, rtl::OUString const&, long&)
layoutimpl::getParent(com::sun::star::uno::Reference<com::sun::star::uno::XInterface>)
commit da0bd7a50139b06e14c1917af044b37d10ebaf4f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Nov 2 16:03:45 2011 +0000
drop freshly unused methods
diff --git a/unotools/inc/unotools/lingucfg.hxx b/unotools/inc/unotools/lingucfg.hxx
index 4ae1020..668cb26 100644
--- a/unotools/inc/unotools/lingucfg.hxx
+++ b/unotools/inc/unotools/lingucfg.hxx
@@ -225,7 +225,6 @@ public:
std::vector< SvtLinguConfigDictionaryEntry > GetActiveDictionariesByFormat( const rtl::OUString &rFormatName );
// functions returning file URLs to the respective images (if found) and empty string otherwise
- ::rtl::OUString GetSpellAndGrammarDialogImage( const ::rtl::OUString &rServiceImplName ) const;
::rtl::OUString GetSpellAndGrammarContextSuggestionImage( const ::rtl::OUString &rServiceImplName ) const;
::rtl::OUString GetSpellAndGrammarContextDictionaryImage( const ::rtl::OUString &rServiceImplName ) const;
::rtl::OUString GetThesaurusDialogImage( const ::rtl::OUString &rServiceImplName ) const;
diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx
index cc08afd..fcf9f76 100644
--- a/unotools/source/config/lingucfg.cxx
+++ b/unotools/source/config/lingucfg.cxx
@@ -1253,21 +1253,6 @@ rtl::OUString SvtLinguConfig::GetVendorImageUrl_Impl(
}
-rtl::OUString SvtLinguConfig::GetSpellAndGrammarDialogImage(
- const rtl::OUString &rServiceImplName
-) const
-{
- rtl::OUString aRes;
- if (rServiceImplName.getLength() > 0)
- {
- rtl::OUString aImageName( A2OU( "SpellAndGrammarDialogImage" ));
- rtl::OUString aPath( GetVendorImageUrl_Impl( rServiceImplName, aImageName ) );
- aRes = aPath;
- }
- return aRes;
-}
-
-
rtl::OUString SvtLinguConfig::GetSpellAndGrammarContextSuggestionImage(
const rtl::OUString &rServiceImplName
) const
diff --git a/vcl/inc/vcl/button.hxx b/vcl/inc/vcl/button.hxx
index 3222734..b2b812c 100644
--- a/vcl/inc/vcl/button.hxx
+++ b/vcl/inc/vcl/button.hxx
@@ -94,7 +94,6 @@ public:
void EnableTextDisplay( sal_Bool bEnable );
void SetFocusRect( const Rectangle& rFocusRect );
- void SetSmallSymbol (bool bSmall=true);
bool IsSmallSymbol () const;
};
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 52eb43e..c5e1a46 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -620,12 +620,6 @@ void Button::EnableTextDisplay( sal_Bool bEnable )
mpButtonData->mnButtonState |= BUTTON_DRAW_NOTEXT;
}
-// -----------------------------------------------------------------------
-void Button::SetSmallSymbol (bool small)
-{
- ImplSetSmallSymbol (small);
-}
-
bool Button::IsSmallSymbol () const
{
return mpButtonData->mbSmallSymbol;
commit 0cbcb89fde8cc81db499bc1e388fd53ef6fa3c3f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Nov 2 16:03:13 2011 +0000
update word count dialog when selection is completed or invalidated
diff --git a/sw/source/ui/wrtsh/select.cxx b/sw/source/ui/wrtsh/select.cxx
index d0c1064..9583155 100644
--- a/sw/source/ui/wrtsh/select.cxx
+++ b/sw/source/ui/wrtsh/select.cxx
@@ -50,6 +50,7 @@
#include <swevent.hxx>
#include <swdtflvr.hxx>
#include <crsskip.hxx>
+#include <wordcountdialog.hxx>
#if OSL_DEBUG_LEVEL > 1
#include <pam.hxx>
@@ -70,6 +71,9 @@ void SwWrtShell::Invalidate()
// to avoid making the slot volatile, invalidate it everytime if something could have been changed
// this is still much cheaper than asking for the state every 200 ms (and avoid background processing)
GetView().GetViewFrame()->GetBindings().Invalidate( FN_STAT_SELMODE );
+ SwWordCountWrapper *pWrdCnt = (SwWordCountWrapper*)GetView().GetViewFrame()->GetChildWindow(SwWordCountWrapper::GetChildWindowId());
+ if (pWrdCnt)
+ pWrdCnt->UpdateCounts();
}
sal_Bool SwWrtShell::SelNearestWrd()
@@ -419,14 +423,19 @@ void SwWrtShell::SttSelect()
void SwWrtShell::EndSelect()
{
- if(!bInSelect || bExtMode)
- return;
- bInSelect = sal_False;
- (this->*fnLeaveSelect)(0,sal_False);
- if(!bAddMode) {
- fnSetCrsr = &SwWrtShell::SetCrsrKillSel;
- fnKillSel = &SwWrtShell::ResetSelect;
+ if(bInSelect && !bExtMode)
+ {
+ bInSelect = sal_False;
+ (this->*fnLeaveSelect)(0,sal_False);
+ if(!bAddMode)
+ {
+ fnSetCrsr = &SwWrtShell::SetCrsrKillSel;
+ fnKillSel = &SwWrtShell::ResetSelect;
+ }
}
+ SwWordCountWrapper *pWrdCnt = (SwWordCountWrapper*)GetView().GetViewFrame()->GetChildWindow(SwWordCountWrapper::GetChildWindowId());
+ if (pWrdCnt)
+ pWrdCnt->UpdateCounts();
}
/* Methode, um eine bestehende wortweise oder zeilenweise Selektion
* zu erweitern.
More information about the Libreoffice-commits
mailing list