Makefile.in | 1
autodoc/Executable_autodoc.mk | 1
autodoc/source/parser/inc/tokens/tkp.hxx | 78 -------------------------------
autodoc/source/parser/tokens/tkp.cxx | 50 -------------------
formula/inc/formula/funcutl.hxx | 2
formula/source/ui/dlg/formdlgs.src | 10 +++
formula/source/ui/dlg/funcutl.cxx | 6 ++
formula/source/ui/inc/ForResId.hrc | 3 -
sc/source/ui/src/namedefdlg.src | 1
solenv/bin/callcatcher.Makefile | 4 +
unusedcode.easy | 24 +++++++--
11 files changed, 42 insertions(+), 138 deletions(-)
New commits:
commit edef1887ff9373b29228e51c44ae091f675a94aa
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Mar 5 12:32:25 2013 +0000
make RefButton quick help toggle saying shrink/expand
Change-Id: Id5b5518a0cb3982ebc398e57499c5c240ee7d683
diff --git a/formula/inc/formula/funcutl.hxx b/formula/inc/formula/funcutl.hxx
index 24729eb..7144350 100644
--- a/formula/inc/formula/funcutl.hxx
+++ b/formula/inc/formula/funcutl.hxx
@@ -72,6 +72,8 @@ class FORMULA_DLLPUBLIC RefButton : public ImageButton
private:
Image aImgRefStart; /// Start reference input
Image aImgRefDone; /// Stop reference input
+ OUString aShrinkQuickHelp;
+ OUString aExpandQuickHelp;
IControlReferenceHandler* pAnyRefDlg; // parent dialog
RefEdit* pRefEdit; // zugeordnetes Edit-Control
diff --git a/formula/source/ui/dlg/formdlgs.src
b/formula/source/ui/dlg/formdlgs.src
index e624e2d..6d0ecfd 100644
--- a/formula/source/ui/dlg/formdlgs.src
+++ b/formula/source/ui/dlg/formdlgs.src
@@ -455,6 +455,11 @@ Image RID_BMP_REFBTN1
MaskColor = STD_MASKCOLOR;
};
+String RID_STR_SHRINK
+{
+ Text [ en-US ] = "Shrink" ;
+};
+
Image RID_BMP_REFBTN2
{
ImageBitmap = Bitmap
@@ -463,3 +468,8 @@ Image RID_BMP_REFBTN2
};
MaskColor = STD_MASKCOLOR;
};
+
+String RID_STR_EXPAND
+{
+ Text [ en-US ] = "Expand" ;
+};
diff --git a/formula/source/ui/dlg/funcutl.cxx
b/formula/source/ui/dlg/funcutl.cxx
index 36b3f04..489e671 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -950,6 +950,8 @@ RefButton::RefButton( Window* _pParent, const ResId&
rResId) :
ImageButton( _pParent, rResId ),
aImgRefStart( ModuleRes( RID_BMP_REFBTN1 ) ),
aImgRefDone( ModuleRes( RID_BMP_REFBTN2 ) ),
+ aShrinkQuickHelp( ModuleRes( RID_STR_SHRINK ).toString() ),
+ aExpandQuickHelp( ModuleRes( RID_STR_EXPAND ).toString() ),
pAnyRefDlg( NULL ),
pRefEdit( NULL )
{
@@ -960,6 +962,8 @@ RefButton::RefButton( Window* _pParent, const ResId&
rResId, RefEdit* pEdit, ICo
ImageButton( _pParent, rResId ),
aImgRefStart( ModuleRes( RID_BMP_REFBTN1 ) ),
aImgRefDone( ModuleRes( RID_BMP_REFBTN2 ) ),
+ aShrinkQuickHelp( ModuleRes( RID_STR_SHRINK ).toString() ),
+ aExpandQuickHelp( ModuleRes( RID_STR_EXPAND ).toString() ),
pAnyRefDlg( _pDlg ),
pRefEdit( pEdit )
{
@@ -969,11 +973,13 @@ RefButton::RefButton( Window* _pParent, const ResId&
rResId, RefEdit* pEdit, ICo
void RefButton::SetStartImage()
{
SetModeImage( aImgRefStart );
+ SetQuickHelpText( aShrinkQuickHelp );
}
void RefButton::SetEndImage()
{
SetModeImage( aImgRefDone );
+ SetQuickHelpText( aExpandQuickHelp );
}
void RefButton::SetReferences( IControlReferenceHandler* pDlg, RefEdit* pEdit )
diff --git a/formula/source/ui/inc/ForResId.hrc
b/formula/source/ui/inc/ForResId.hrc
index 0a9f7ae..b00b7ef 100644
--- a/formula/source/ui/inc/ForResId.hrc
+++ b/formula/source/ui/inc/ForResId.hrc
@@ -39,12 +39,13 @@
// Dialog Control Id's
-----------------------------------------------------------
// strings
+#define RID_STR_SHRINK (RID_STRING_START + 0)
+#define RID_STR_EXPAND (RID_STRING_START + 1)
// bitmap
#define RID_BMP_REFBTN1 (RID_BITMAP_START + 0)
#define RID_BMP_REFBTN2 (RID_BITMAP_START + 2)
-
// pages
#define RID_FORMULATAB_STRUCT (RID_PAGE_START + 0)
#define RID_FORMULATAB_FUNCTION (RID_PAGE_START + 1)
diff --git a/sc/source/ui/src/namedefdlg.src b/sc/source/ui/src/namedefdlg.src
index 2bf1926..6d2e0d3 100644
--- a/sc/source/ui/src/namedefdlg.src
+++ b/sc/source/ui/src/namedefdlg.src
@@ -100,7 +100,6 @@ ModelessDialog RID_SCDLG_NAMES_DEFINE
Pos = MAP_APPFONT ( 205 , 43 ) ;
Size = MAP_APPFONT ( 15 , 13 ) ;
TabStop = TRUE ;
- QuickHelpText [ en-US ] = "Shrink" ;
};
CheckBox BTN_PRINTAREA
{
commit afae9b56a0fd80581043afae94d38b29c4262016
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Mar 5 10:51:35 2013 +0000
update unusedcode target and list
Change-Id: I53344d6a17570c044ad6e24cc148e07fe6f99ae8
diff --git a/Makefile.in b/Makefile.in
index 92ae836..a7803ca 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -377,6 +377,7 @@ findunusedcode:
| grep -v ^CIcc \
| grep -v ^CLuceneError:: \
| grep -v ^cppu:: \
+ | grep -v ^CppUnit:: \
| grep -v ^Dde \
| grep -v ^graphite2:: \
| grep -v ^jvmaccess:: \
diff --git a/autodoc/Executable_autodoc.mk b/autodoc/Executable_autodoc.mk
index 8f7ff19..4921767 100644
--- a/autodoc/Executable_autodoc.mk
+++ b/autodoc/Executable_autodoc.mk
@@ -31,7 +31,6 @@ $(eval $(call gb_Executable_add_exception_objects,autodoc,\
autodoc/source/exes/adc_uni/main \
autodoc/source/exes/adc_uni/adc_msg \
autodoc/source/exes/adc_uni/cmd_run \
- autodoc/source/parser/tokens/tkp \
autodoc/source/parser/tokens/tokdeal \
autodoc/source/parser/tokens/stmstate \
autodoc/source/parser/tokens/tkpcontx \
diff --git a/autodoc/source/parser/inc/tokens/tkp.hxx
b/autodoc/source/parser/inc/tokens/tkp.hxx
deleted file mode 100644
index bd78cd2..0000000
--- a/autodoc/source/parser/inc/tokens/tkp.hxx
+++ /dev/null
@@ -1,78 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef ADC_TKP_HXX
-#define ADC_TKP_HXX
-
-// USED SERVICES
- // BASE CLASSES
- // COMPONENTS
-class CharacterSource;
-class TkpContext;
- // PARAMETRS
-
-
-
-/** This is the interface for parser classes, which get a sequence of tokens
from
- a text.
-
- Start() starts to parse the text from the given i_rSource.
-
- The algorithms for parsing tokens from the text are an issue of
- the derived classes.
-*/
-
-class TokenParser
-{
- public:
- // LIFECYCLE
- TokenParser();
- virtual ~TokenParser() {}
-
- // OPERATIONS
- /** Start parsing a character source. Any previously parsed sources
- are discarded.
- */
- virtual void Start(
- CharacterSource &
- i_rSource );
-
- /// @return true, if there are more tokens to parse.
- bool HasMore() const { return bHasMore; }
-
- private:
- void InitSource(
- CharacterSource &
- i_rSource );
-
- virtual void SetStartContext() = 0;
- virtual void SetCurrentContext(
- TkpContext & io_rContext ) = 0;
- virtual TkpContext &
- CurrentContext() = 0;
- // DATA
- CharacterSource * pChars;
- bool bHasMore;
-};
-
-
-#endif
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/tokens/tkp.cxx
b/autodoc/source/parser/tokens/tkp.cxx
deleted file mode 100644
index 217827b..0000000
--- a/autodoc/source/parser/tokens/tkp.cxx
+++ /dev/null
@@ -1,50 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <precomp.h>
-#include <tokens/tkp.hxx>
-
-// NOT FULLY DECLARED SERVICES
-#include <tools/tkpchars.hxx>
-#include <tokens/tkpcontx.hxx>
-
-
-
-TokenParser::TokenParser()
- : pChars(0),
- bHasMore(false)
-{
-}
-
-void
-TokenParser::Start( CharacterSource & i_rSource )
-{
- InitSource(i_rSource);
-}
-
-void
-TokenParser::InitSource( CharacterSource & i_rSource )
-{
- pChars = &i_rSource;
- bHasMore = true;
- SetStartContext();
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/bin/callcatcher.Makefile b/solenv/bin/callcatcher.Makefile
index 2375b03..9ea7ea5 100644
--- a/solenv/bin/callcatcher.Makefile
+++ b/solenv/bin/callcatcher.Makefile
@@ -26,6 +26,8 @@ findunusedcode:
$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.gbuild
ooinstall -l $(DEVINSTALLDIR)/opt
$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.gbuild
subsequentcheck
- callanalyse $(WORKDIR)/LinkTarget/*/* > unusedcode.all
+ callanalyse $(WORKDIR)/LinkTarget/*/* $(WORKDIR)/LinkTarget/*/*/* \
+ $(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/.libs/libcppunit.so* \
+ > unusedcode.all
# vim: set noet sw=4 ts=4:
diff --git a/unusedcode.easy b/unusedcode.easy
index 73ee6b5..858a692 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,11 +1,18 @@
-ScFiltersTest::testColorScaleODS()
-ScFiltersTest::testColorScaleXLSX()
+Application::PostZoomEvent(unsigned long, Window*, ZoomEvent*)
+EditTextObjectImpl::RemoveParaAttribs(unsigned short)
+EditTextObjectImpl::SetParaAttribs(unsigned long, SfxItemSet const&)
+FontSelectPatternAttributes::FontSelectPatternAttributes(PhysicalFontFace
const&, Size const&, float, int, bool)
+LanguageTag::reset(_rtl_Locale const&)
+PoEntry::setFuzzy(bool)
+PoEntry::setMsgStr(rtl::OString const&)
+PoHeader::PoHeader(std::basic_ifstream<char, std::char_traits<char> >&)
+ScConditionalFormat::dumpInfo(rtl::OUStringBuffer&) const
+ScDocument::GetEditText(ScAddress const&) const
ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent()
ScVbaFormat<ooo::vba::excel::XStyle>::setAddIndent(com::sun::star::uno::Any
const&)
-StyleSettings::GetPersonaFooter() const
-TemplateAbstractView::deselectOverlayItem(unsigned short)
-Test::test1Table1Page()
TextEngine::GetLeftMargin() const
+ThumbnailView::deselectItem(unsigned short)
+XclExpPivotCache::GetFieldAcc(rtl::OUString const&)
apitest::XCellRangesQuery::testQueryFormulaCells()
apitest::XDataPilotDescriptor::testGetHiddenFields()
apitest::XDataPilotFieldGrouping::testCreateDateGroup()
@@ -25,6 +32,7 @@ apitest::XPropertySet::testRemovePropertyChangeListener()
apitest::XPropertySet::testRemoveVetoableChangeListener()
apitest::XSheetOutline::testAutoOutline()
apitest::XSpreadsheetDocument::testGetSheets()
+apitest::XText::testInsertRemoveTextContent()
canvas::createSurfaceProxyManager(boost::shared_ptr<canvas::IRenderModule>
const&)
comphelper::detail::ConfigurationWrapper::getGroupReadWrite(boost::shared_ptr<comphelper::ConfigurationChanges>
const&, rtl::OUString const&) const
comphelper::detail::ConfigurationWrapper::getLocalizedPropertyValue(rtl::OUString
const&) const
@@ -32,8 +40,12 @@
comphelper::detail::ConfigurationWrapper::setLocalizedPropertyValue(boost::share
connectivity::file::OStatement_Base::reset()
connectivity::sdbcx::OGroup::OGroup(rtl::OUString const&, unsigned char)
connectivity::sdbcx::OGroup::OGroup(unsigned char)
+framework::MenuManager::getContext()
jfw_plugin::VendorBase::createInstance()
-oox::drawingml::TextListStyle::dump() const # Only used in debug mode
+oox::drawingml::TextListStyle::dump() const
+oox::xls::BiffDrawingObjectBase::BiffDrawingObjectBase(oox::xls::WorksheetHelper
const&)
+sc_apitest::main()
+sd::BluetoothServer::addCommunicator(sd::Communicator*)
sd::LeftDrawPaneShell::RegisterInterface(SfxModule*)
sd::LeftImpressPaneShell::RegisterInterface(SfxModule*)
sd::ToolPanelPaneShell::RegisterInterface(SfxModule*)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
