forms/source/xforms/convert.cxx | 22 --
forms/source/xforms/convert.hxx | 16 --
include/svtools/ctrlbox.hxx | 1
include/svx/pagectrl.hxx | 1
include/svx/relfld.hxx | 1
include/vcl/button.hxx | 1
include/vcl/morebtn.hxx | 2
sc/source/ui/inc/optsolver.hxx | 1
sc/source/ui/inc/tphfedit.hxx | 2
sc/source/ui/miscdlgs/optsolver.cxx | 5
sc/source/ui/pagedlg/tphfedit.cxx | 45 ------
sfx2/source/appl/appmisc.cxx | 29 ---
svtools/source/control/ctrlbox.cxx | 12 -
svx/source/dialog/pagectrl.cxx | 41 -----
svx/source/dialog/relfld.cxx | 11 -
sw/source/ui/cctrl/actctrl.cxx | 6
sw/source/ui/inc/actctrl.hxx | 6
sw/source/ui/inc/colex.hxx | 16 --
unusedcode.easy | 191 +++++++++++++++++++++++++-
vcl/source/control/button.cxx | 5
vcl/source/control/morebtn.cxx | 16 --
xmlsecurity/AllLangResTarget_xsec.mk | 1
xmlsecurity/inc/xmlsecurity/global.hrc | 4
xmlsecurity/inc/xmlsecurity/macrosecurity.hxx | 10 -
xmlsecurity/source/dialogs/macrosecurity.cxx | 35 ----
xmlsecurity/source/dialogs/macrosecurity.src | 37 -----
26 files changed, 188 insertions(+), 329 deletions(-)
New commits:
commit 62c0990b113688afb4c1b5ea355e29c57a9c7811
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Jul 2 09:22:11 2013 +0100
tentative updated callcatcher results
Change-Id: I70b23097baa75079d96fd7b296073921be4f4af4
diff --git a/unusedcode.easy b/unusedcode.easy
index 50ec494..529c1ef 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,12 +1,98 @@
-Application::PostZoomEvent(unsigned long, Window*, ZoomEvent*)
-EditTextObjectImpl::SetParaAttribs(unsigned long, SfxItemSet const&)
+(anonymous namespace)::Coverage::test_start(rtl::OUString)
+(anonymous namespace)::StringToken::toInt32(int&) const
+(anonymous namespace)::StringTokenizer::StringTokenizer(rtl::OUString const&,
unsigned short)
+(anonymous namespace)::StringTokenizer::getNextToken()
+(anonymous namespace)::VBATest::testMiscOLEStuff()
+AffineMatrixItem::GetAffineMatrix2D() const
+BitmapWriteAccess::DrawPolyPolygon(PolyPolygon const&)
+BitmapWriteAccess::DrawPolygon(Polygon const&)
+DbgRegisterNamedUserChannel(rtl::OUString const&, void (*)(char const*))
+EditTextObjectImpl::SetParaAttribs(int, SfxItemSet const&)
FontSelectPatternAttributes::FontSelectPatternAttributes(PhysicalFontFace
const&, Size const&, float, int, bool)
+GalleryTheme::GetStrURL() const
+ImplRegionBand::IsInside(long, long)
+ImplRegionBand::IsOver(long, long)
LanguageTag::reset(_rtl_Locale const&)
-ScConditionalFormat::dumpInfo(rtl::OUStringBuffer&) const
-ScDocument::GetEditText(ScAddress const&) const
+LineEndLB::LineEndLB(Window*, long)
+Menu::GetItemImageAngle(unsigned short) const
+Menu::GetItemImageMirrorMode(unsigned short) const
+Menu::GetLogo() const
+Menu::SetLogo()
+Menu::SetLogo(MenuLogo const&)
+OWriteAccelatorDocumentHandler::OWriteAccelatorDocumentHandler(std::__debug::list<SvtAcceleratorConfigItem,
std::allocator<SvtAcceleratorConfigItem> > const&,
com::sun::star::uno::Reference<com::sun::star::xml::sax::XDocumentHandler>)
+OWriteAccelatorDocumentHandler::WriteAcceleratorDocument()
+OutputDevice::GetCanvas() const
+OutputDevice::LogicToLogic(basegfx::B2DPolyPolygon const&, MapMode const&,
MapMode const&)
+OutputDevice::LogicToPixel(Region const&, MapMode const&) const
+OutputDevice::LogicToPixel(basegfx::B2DPolygon const&) const
+OutputDevice::LogicToPixel(basegfx::B2DPolygon const&, MapMode const&) const
+OutputDevice::PixelToLogic(Region const&, MapMode const&) const
+RawBitmap::RawBitmap()
+RawBitmap::~RawBitmap()
+RscCompiler::Append(rtl::OString const&, rtl::OString const&)
+Ruler::GetPageWidth() const
+SalGraphics::drawTransformedBitmap(basegfx::B2DPoint const&, basegfx::B2DPoint
const&, basegfx::B2DPoint const&, SalBitmap const&, SalBitmap const*)
+ScCellIterator::getValue()
+ScCellIterator::hasNumeric() const
+ScCellValue::ScCellValue(EditTextObject const&)
+ScCellValue::ScCellValue(ScFormulaCell const&)
+ScCellValue::hasNumeric() const
+ScCellValue::hasString() const
+ScCellValue::set(EditTextObject const&)
+ScCellValue::set(ScFormulaCell const&)
+ScColumn::InitBlockPosition(sc::ColumnBlockConstPosition&) const
+ScColumn::MoveListeners(SvtBroadcaster&, int)
+ScColumn::SplitFormulaCellGroup(std::pair<mdds::__mtv::iterator_base<mdds::multi_type_vector<mdds::mtv::custom_block_func3<mdds::mtv::default_element_block<52,
rtl::OUString>, mdds::mtv::noncopyable_managed_element_block<53,
EditTextObject>, mdds::mtv::noncopyable_managed_element_block<54,
ScFormulaCell> > >::iterator_trait,
mdds::__mtv::private_data_forward_update<mdds::__mtv::iterator_value_node<unsigned
long, mdds::mtv::base_element_block> > >, unsigned long> const&) const
+ScDBQueryDataIterator::DataAccessInternal::setPos(unsigned long)
+ScDPObject::ParseFilters(ScDPGetPivotDataField&,
std::__debug::vector<ScDPGetPivotDataField,
std::allocator<ScDPGetPivotDataField> >&, rtl::OUString const&)
+ScDocument::GetCellCount(short, short) const
+ScDocument::GetFormulaTokens(ScAddress const&) const
+ScDocument::GetStringCell(ScAddress const&) const
+ScDocument::IsEmptyData(short, short) const
+ScDocument::SetFormulaResults(ScAddress const&, double const*, unsigned long)
+ScExtIButton::GetSelected() const
+ScFormulaCell::HasColRowName() const
+ScFormulaCell::IsSharedInvariant() const
+ScGlobal::GetStandardFormat(double, SvNumberFormatter&, unsigned long, short)
+ScRefCellValue::commit(ScColumn&, int) const
+ScUndoSetCell::ScUndoSetCell(ScDocShell*, ScAddress const&, ScCellValue const&)
ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent()
ScVbaFormat<ooo::vba::excel::XStyle>::setAddIndent(com::sun::star::uno::Any
const&)
+ServerFont::GetGlyphBitmap1(int, RawBitmap&) const
+ServerFont::GetGlyphBitmap8(int, RawBitmap&) const
+SfxAppMenuControl_Impl::RegisterControl(unsigned short, SfxModule*)
+SfxSpecialConfigError_Impl::SfxSpecialConfigError_Impl(String const&)
+SfxTemplatePanelControl::GetISfxTemplateCommon()
+SfxTemplatePanelControl::SetParagraphFamily()
+SmFontPickList::Contains(Font const&) const
+StatusBar::CopyItems(StatusBar const&)
+StatusBar::HideItems()
+StatusBar::ShowItems()
+SvFileStream::GetFileHandle() const
+SvdProgressInfo::ReportError()
+SvpSalGraphics::SvpSalGraphics()
+SvpSalGraphics::setDevice(boost::shared_ptr<basebmp::BitmapDevice>&)
+SvpSalInstance::PostEvent(SalFrame const*, void*, unsigned short)
+SvpSalInstance::PostedEventsInQueue()
+SvpSalInstance::deregisterFrame(SalFrame*)
+SvtAccessibilityOptions::GetColorValueSetColumnCount() const
+SvtAccessibilityOptions::GetEdgeBlending() const
+SvtAccessibilityOptions::GetListBoxMaximumLineCount() const
+SvtAccessibilityOptions::GetPreviewUsesCheckeredBackground() const
+SvtAccessibilityOptions::SetColorValueSetColumnCount(short)
+SvtAccessibilityOptions::SetEdgeBlending(short)
+SvtAccessibilityOptions::SetListBoxMaximumLineCount(short)
+SvtAccessibilityOptions::SetPreviewUsesCheckeredBackground(unsigned char)
+SvxGalleryItem::SvxGalleryItem(unsigned short)
+SvxNumRule::Create(SvStream&)
+SvxNumberFormat::Create(SvStream&)
+Test::test1Table1Page()
TextEngine::GetLeftMargin() const
+ThumbnailView::DeselectItem(unsigned short)
+ThumbnailView::GetItemText(unsigned short) const
+ThumbnailView::SetColor(Color const&)
+VclMultiLineEdit::SetTextSelectable(bool)
+XclExpXFBuffer::InsertWithNumFmt(ScPatternAttr const*, short, unsigned long,
bool)
apitest::XCellRangesQuery::testQueryFormulaCells()
apitest::XDataPilotDescriptor::testGetHiddenFields()
apitest::XDataPilotFieldGrouping::testCreateDateGroup()
@@ -27,19 +113,114 @@ apitest::XPropertySet::testRemoveVetoableChangeListener()
apitest::XSheetOutline::testAutoOutline()
apitest::XSpreadsheetDocument::testGetSheets()
apitest::XText::testInsertRemoveTextContent()
+basebmp::BitmapDevice::getBufferSize() const
+basebmp::BitmapDevice::setDamageTracker(boost::shared_ptr<basebmp::IBitmapDeviceDamageTracker>
const&)
+basebmp::createBitmapDevice(basegfx::B2IVector const&, bool, int,
boost::shared_array<unsigned char> const&,
boost::shared_ptr<std::__debug::vector<basebmp::Color,
std::allocator<basebmp::Color> > const> const&)
+basebmp::createBitmapDevice(basegfx::B2IVector const&, bool, int,
boost::shared_ptr<std::__debug::vector<basebmp::Color,
std::allocator<basebmp::Color> > const> const&)
+basegfx::BPixel::getEmptyBPixel()
+basegfx::snapToNearestMultiple(double, double)
+basegfx::snapToRange(double, double, double)
+basegfx::unotools::homMatrixFromMatrix(basegfx::B2DHomMatrix&,
com::sun::star::geometry::Matrix2D const&)
canvas::createSurfaceProxyManager(boost::shared_ptr<canvas::IRenderModule>
const&)
+comphelper::ComponentContext::ComponentContext(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory>
const&)
+comphelper::ComponentContext::createComponentWithArguments(rtl::OUString
const&, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&) const
+comphelper::ComponentContext::getLegacyServiceFactory() const
+comphelper::ComponentContext::getSingleton(rtl::OUString const&) const
+comphelper::MediaDescriptor::PROP_DEEPDETECTION()
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
connectivity::file::OStatement_Base::reset()
connectivity::sdbcx::OGroup::OGroup(rtl::OUString const&, unsigned char)
connectivity::sdbcx::OGroup::OGroup(unsigned char)
+dbaccess::ORowSet_CreateInstance(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory>
const&)
+dbtools::DBTypeConversion::getMsFromTime(com::sun::star::util::Time const&)
+drawinglayer::attribute::FontAttribute::isDefault() const
+drawinglayer::attribute::MaterialAttribute3D::isDefault() const
+drawinglayer::attribute::Sdr3DLightAttribute::isDefault() const
+drawinglayer::attribute::Sdr3DObjectAttribute::isDefault() const
+drawinglayer::attribute::SdrFillGraphicAttribute::getLogSize() const
+drawinglayer::geometry::ViewInformation2D::isDefault() const
+formula::FormulaDlg::CheckMatrix()
+formula::FormulaDlg::isUserMatrix() const
+framework::MenuBarManager::getComponentContext()
framework::MenuManager::getContext()
jfw_plugin::VendorBase::createInstance()
+oox::core::FilterBaseImpl::finalizeFilter()
oox::drawingml::TextListStyle::dump() const
oox::xls::BiffDrawingObjectBase::BiffDrawingObjectBase(oox::xls::WorksheetHelper
const&)
+oox::xls::SheetDataBuffer::writeXfIdRangeListProperties(int, int,
oox::xls::ApiCellRangeList const&) const
+oox::xls::StylesBuffer::writeStyleXfToPropertySet(oox::PropertySet&, int) const
+oox::xls::WorksheetGlobals::getColumns(oox::ValueRange const&) const
+oox::xls::WorksheetGlobals::getRows(oox::ValueRange const&) const
+sc::CellTextAttr::CellTextAttr(unsigned short, unsigned char)
+sc::sidebar::CellLineStyleValueSet::GetSelItem()
+sc::sidebar::CellLineStyleValueSet::SetCusEnable(bool)
+sc::sidebar::CellLineStyleValueSet::SetImage(Image)
sc_apitest::main()
-sd::BluetoothServer::addCommunicator(sd::Communicator*)
sd::LeftDrawPaneShell::RegisterInterface(SfxModule*)
sd::LeftImpressPaneShell::RegisterInterface(SfxModule*)
+sd::SdPhotoAlbumDialog::createXShapeFromUrl(rtl::OUString const&,
com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory>,
com::sun::star::uno::Reference<com::sun::star::graphic::XGraphicProvider>)
sd::ToolPanelPaneShell::RegisterInterface(SfxModule*)
+sd::framework::FrameworkHelper::GetPaneWindow(com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId>
const&)
+sd::framework::FrameworkHelper::GetResource(com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId>
const&)
+sd::framework::FrameworkHelper::RequestResourceDeactivation(com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId>
const&)
+sd::framework::FrameworkHelper::RunOnResourceDeactivation(com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId>
const&, boost::function<void (bool)> const&, bool)
+sd::framework::Pane::SetWindow(Window*)
+sd::sidebar::CurrentMasterPagesSelector::NotifyHint(SfxBroadcaster&, SfxHint
const&)
+sd::sidebar::LayoutMenu::GetMinimumWidth()
+sd::sidebar::LayoutMenu::GetPreferredSize()
+sd::sidebar::LayoutMenu::GetPreferredWidth(int)
+sdr::overlay::OverlayRectangle::setBlinkTime(unsigned int)
+sdr::overlay::OverlayRectangle::setSecondPosition(basegfx::B2DPoint const&)
+sdr::table::SdrTableObj::getRowCount() const
+sfx2::sidebar::AsynchronousCall::RequestCall(boost::function<void ()> const&)
+sfx2::sidebar::Context::EvaluateMatch(std::__debug::vector<sfx2::sidebar::Context,
std::allocator<sfx2::sidebar::Context> > const&) const
+sfx2::sidebar::ContextList::IsEmpty()
+sfx2::sidebar::Deck::GetIconURL(bool) const
+sfx2::sidebar::Deck::PrintWindowTree(std::__debug::vector<sfx2::sidebar::Panel*,
std::allocator<sfx2::sidebar::Panel*> > const&)
+sfx2::sidebar::EnumContext::EvaluateMatch(std::__debug::vector<sfx2::sidebar::EnumContext,
std::allocator<sfx2::sidebar::EnumContext> > const&) const
+sfx2::sidebar::EnumContext::GetApplication() const
+sfx2::sidebar::EnumContext::GetCombinedContext() const
+sfx2::sidebar::FocusManager::IsAnyButtonFocused() const
+sfx2::sidebar::FocusManager::IsAnyPanelFocused() const
+sfx2::sidebar::Paint::Set(sfx2::sidebar::Paint const&)
+sfx2::sidebar::Panel::PrintWindowTree()
+sfx2::sidebar::SidebarController::ShowDetailMenu(rtl::OUString const&) const
+sfx2::sidebar::SidebarDockingWindow::GetChildWindow()
+sfx2::sidebar::SidebarPanelBase::GetControl() const
+sfx2::sidebar::SidebarPanelBase::SetControl(Window*)
+std::_Rb_tree<rtl::OUString, std::pair<rtl::OUString const, (anonymous
namespace)::TemplateId>, std::_Select1st<std::pair<rtl::OUString const,
(anonymous namespace)::TemplateId> >, std::less<rtl::OUString>,
std::allocator<std::pair<rtl::OUString const, (anonymous
namespace)::TemplateId> > >::_Rb_tree(std::_Rb_tree<rtl::OUString,
std::pair<rtl::OUString const, (anonymous namespace)::TemplateId>,
std::_Select1st<std::pair<rtl::OUString const, (anonymous
namespace)::TemplateId> >, std::less<rtl::OUString>,
std::allocator<std::pair<rtl::OUString const, (anonymous
namespace)::TemplateId> > >&&)
+std::auto_ptr<formula::FormulaTokenArray>::auto_ptr(std::auto_ptr<formula::FormulaTokenArray>&)
+std::auto_ptr<formula::FormulaTokenArray>::auto_ptr(std::auto_ptr_ref<formula::FormulaTokenArray>)
+svx::DialControl::GetLinkedField() const
+svx::DialControl::GetModifyHdl() const
+svx::sidebar::AreaPropertyPanel::LinkStubImplPopupModeEndHdl(void*, void*)
+svx::sidebar::AreaTransparencyGradientControl::ToGetFocus()
+svx::sidebar::BulletsTypeMgr::BulletsTypeMgr(unsigned short, SfxItemSet const*)
+svx::sidebar::ColorPanel::GetPreferredHeight(int)
+svx::sidebar::ContextPanel::GetPreferredHeight(int)
+svx::sidebar::GraphyicBulletsTypeMgr::GraphyicBulletsTypeMgr(unsigned short,
SfxItemSet const*)
+svx::sidebar::LinePropertyPanel::LinkStubImplPopupModeEndHdl(void*, void*)
+svx::sidebar::LineStyleValueSet::LineStyleValueSet(Window*, ResId const&)
+svx::sidebar::LineStyleValueSet::SetFirstSelect(bool)
+svx::sidebar::LineStyleValueSet::SetFirstString(String)
+svx::sidebar::LineWidthControl::GetValueSet()
+svx::sidebar::MixBulletsTypeMgr::MixBulletsTypeMgr(unsigned short, SfxItemSet
const*)
+svx::sidebar::NBOutlineTypeMgrFact::NBOutlineTypeMgrFact()
+svx::sidebar::NumberingTypeMgr::GetNumCount() const
+svx::sidebar::NumberingTypeMgr::GetNumSettingByIndex(unsigned short) const
+svx::sidebar::NumberingTypeMgr::NumberingTypeMgr(unsigned short, SfxItemSet
const*)
+svx::sidebar::OutlineTypeMgr::OutlineTypeMgr(unsigned short, SfxItemSet const*)
+svx::sidebar::ParaPropertyPanel::InitImageList(boost::scoped_ptr<ToolBox>&,
ImageList&, ImageList&)
+svx::sidebar::ParaPropertyPanel::LinkStubImplPopupModeEndHdl(void*, void*)
+svx::sidebar::ParaPropertyPanel::ShowMenu()
+svx::sidebar::PosSizePropertyPanel::ShowMenu()
+svx::sidebar::SvxSBFontNameBox::SvxSBFontNameBox(Window*, ResId const&)
+svx::sidebar::TextCharacterSpacingControl::ToGetFocus()
+unoidl::UnoidlProvider::getConstant(unsigned int) const
+utl::ConfigItem::getUniqueSetElementName(rtl::OUString const&, rtl::OUString&)
+utl::toISO8601(com::sun::star::util::Time const&)
+vcl::unohelper::getNaturalStringSorterForAppLocale()
+vclmain::createApplication()
+writerfilter::dmapper::DomainMapperTableManager::CopyTextProperties(boost::shared_ptr<writerfilter::dmapper::PropertyMap>,
boost::shared_ptr<writerfilter::dmapper::StyleSheetTable>)
commit d4395f450de3cdcf5fde2187054a44eca680d81f
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Jul 2 09:19:05 2013 +0100
drop unused SfxSpecialConfigError_Impl
unused since a2bf98857b675b2d10a4fd93a0413229abebf3f1
Change-Id: I73c253e763eb9239256dfd78b4b782a36bc3a30d
diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx
index 06f18fb..d5ab329 100644
--- a/sfx2/source/appl/appmisc.cxx
+++ b/sfx2/source/appl/appmisc.cxx
@@ -88,35 +88,6 @@ using namespace ::com::sun::star::container;
#define SfxApplication
#include "sfxslots.hxx"
-class SfxSpecialConfigError_Impl
-{
- String aError;
-
-public:
-
- SfxSpecialConfigError_Impl( const String& rStr );
- DECL_LINK( TimerHdl, Timer*);
-};
-
-
-SfxSpecialConfigError_Impl::SfxSpecialConfigError_Impl( const String& rStr ) :
- aError( rStr )
-{
- Timer *pTimer = new Timer;
- pTimer->SetTimeoutHdl( LINK(this, SfxSpecialConfigError_Impl, TimerHdl) );
- pTimer->SetTimeout( 0 );
- pTimer->Start();
-}
-
-IMPL_LINK( SfxSpecialConfigError_Impl, TimerHdl, Timer*, pTimer )
-{
- delete pTimer;
- ErrorBox( 0, WinBits( WB_OK ) , aError ).Execute();
- delete this;
- SFX_APP()->GetAppDispatcher_Impl()->Execute( SID_QUITAPP );
- return 0L;
-}
-
//====================================================================
#define SFX_ITEMTYPE_STATBAR 4
commit 7d943c1c572d463ebd0a997973383a579b60951f
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Jul 2 09:16:40 2013 +0100
remove unused MoreButtons apis pieces
Change-Id: I087a45684041b6d816fbd09ebb24f727dd02d8be
diff --git a/include/vcl/morebtn.hxx b/include/vcl/morebtn.hxx
index 7b5399f..3cf4a4a 100644
--- a/include/vcl/morebtn.hxx
+++ b/include/vcl/morebtn.hxx
@@ -73,8 +73,6 @@ public:
void SetMoreText( const OUString& rNewText );
void SetLessText( const OUString& rNewText );
- OUString GetMoreText() const;
- OUString GetLessText() const;
};
inline void MoreButton::SetState( sal_Bool bNewState )
diff --git a/vcl/source/control/morebtn.cxx b/vcl/source/control/morebtn.cxx
index 5d61292..82c4193 100644
--- a/vcl/source/control/morebtn.cxx
+++ b/vcl/source/control/morebtn.cxx
@@ -206,14 +206,6 @@ void MoreButton::SetMoreText( const OUString& rText )
SetText( rText );
}
-OUString MoreButton::GetMoreText() const
-{
- if ( mpMBData )
- return mpMBData->maMoreText;
- else
- return PushButton::GetText();
-}
-
void MoreButton::SetLessText( const OUString& rText )
{
if ( mpMBData )
@@ -223,12 +215,4 @@ void MoreButton::SetLessText( const OUString& rText )
SetText( rText );
}
-OUString MoreButton::GetLessText() const
-{
- if ( mpMBData )
- return mpMBData->maLessText;
- else
- return PushButton::GetText();
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit fae7447283142b359c9f9ea80c3cc79ceab52e2c
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Jul 2 09:14:03 2013 +0100
drop unused convertWhitespace
Change-Id: I2e27e498cb86d5aaeff692e62e75ee8c8200e729
diff --git a/forms/source/xforms/convert.cxx b/forms/source/xforms/convert.cxx
index 285b3a7..b1bda6e 100644
--- a/forms/source/xforms/convert.cxx
+++ b/forms/source/xforms/convert.cxx
@@ -470,28 +470,6 @@ Convert::Any_t Convert::toAny( const OUString& rValue,
}
//------------------------------------------------------------------------
-OUString Convert::convertWhitespace( const OUString& _rString, sal_Int16
_nWhitespaceTreatment )
-{
- OUString sConverted;
- switch( _nWhitespaceTreatment )
- {
- default:
- OSL_FAIL( "Convert::convertWhitespace: invalid whitespace treatment
constant!" );
- // NO break
- case com::sun::star::xsd::WhiteSpaceTreatment::Preserve:
- sConverted = _rString;
- break;
- case com::sun::star::xsd::WhiteSpaceTreatment::Replace:
- sConverted = replaceWhitespace( _rString );
- break;
- case com::sun::star::xsd::WhiteSpaceTreatment::Collapse:
- sConverted = collapseWhitespace( _rString );
- break;
- }
- return sConverted;
-}
-
-//------------------------------------------------------------------------
OUString Convert::replaceWhitespace( const OUString& _rString )
{
OUStringBuffer aBuffer( _rString );
diff --git a/forms/source/xforms/convert.hxx b/forms/source/xforms/convert.hxx
index 8da1090..f3fa524 100644
--- a/forms/source/xforms/convert.hxx
+++ b/forms/source/xforms/convert.hxx
@@ -72,22 +72,6 @@ public:
/// convert XML representation to Any of given type
Any_t toAny( const OUString&, const Type_t& );
- /** translates the whitespaces in a given string, according
- to a given <type
scope="com::sun::star::xsd">WhiteSpaceTreatment</type>.
-
- @param _rString
- the string to convert
- @param _nWhitespaceTreatment
- a constant from the <type
scope="com::sun::star::xsd">WhiteSpaceTreatment</type> group, specifying
- how to handle whitespaces
- @return
- the converted string
- */
- static OUString convertWhitespace(
- const OUString& _rString,
- sal_Int16 _nWhitespaceTreatment
- );
-
/** replace all occurrences 0x08, 0x0A, 0x0D with 0x20
*/
static OUString replaceWhitespace( const OUString& _rString );
commit 9eeacd275178f5fed34ee9debf431a1ac3e169cc
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Jul 2 09:10:55 2013 +0100
XmlReadOnlyImage is now unused post .ui conversions
Change-Id: Ib90966ed6e791371dacd8d9cdf8234fa66b02858
diff --git a/xmlsecurity/AllLangResTarget_xsec.mk
b/xmlsecurity/AllLangResTarget_xsec.mk
index 5c815b7..9d77f33 100644
--- a/xmlsecurity/AllLangResTarget_xsec.mk
+++ b/xmlsecurity/AllLangResTarget_xsec.mk
@@ -25,7 +25,6 @@ $(eval $(call gb_SrsTarget_set_include,xmlsec/res,\
$(eval $(call gb_SrsTarget_add_files,xmlsec/res,\
xmlsecurity/source/dialogs/certificateviewer.src \
- xmlsecurity/source/dialogs/macrosecurity.src \
xmlsecurity/source/dialogs/digitalsignaturesdialog.src \
xmlsecurity/source/component/warnbox.src \
))
diff --git a/xmlsecurity/inc/xmlsecurity/global.hrc
b/xmlsecurity/inc/xmlsecurity/global.hrc
index 91f8547..7608d5c 100644
--- a/xmlsecurity/inc/xmlsecurity/global.hrc
+++ b/xmlsecurity/inc/xmlsecurity/global.hrc
@@ -27,8 +27,8 @@
#define RID_XMLSECTP_DETAILS 1004
#define RID_XMLSECTP_CERTPATH 1005
#define RID_XMLSECTP_MACROWARN 1009
-#define RID_XMLSECTP_READONLY_CONFIG_TIP 1010
-#define RID_XMLSECTP_LOCK 1011
+
+
#define RID_XMLSECWB_NO_MOZILLA_PROFILE 1013
#endif
diff --git a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx
b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx
index 616e3fa..1136224 100644
--- a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx
+++ b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx
@@ -39,16 +39,6 @@ namespace xml { namespace crypto {
class MacroSecurityTP;
-class XmlReadOnlyImage : public FixedImage
-{
-public:
- XmlReadOnlyImage(Window* pParent, const ResId rResId);
- ~XmlReadOnlyImage();
-
- virtual void RequestHelp( const HelpEvent& rHEvt );
- static const OUString& GetHelpTip();
-};
-
class MacroSecurity : public TabDialog
{
private:
diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx
b/xmlsecurity/source/dialogs/macrosecurity.cxx
index 73d483f..19c3228 100644
--- a/xmlsecurity/source/dialogs/macrosecurity.cxx
+++ b/xmlsecurity/source/dialogs/macrosecurity.cxx
@@ -433,39 +433,4 @@ void MacroSecurityTrustedSourcesTP::ClosePage( void )
mpDlg->maSecOptions.SetTrustedAuthors( maTrustedAuthors );
}
-XmlReadOnlyImage::XmlReadOnlyImage(Window* pParent, const ResId rResId) :
- FixedImage(pParent, rResId)
-{
- SetImage( Image(XMLSEC_RES( RID_XMLSECTP_LOCK )));
-}
-
-XmlReadOnlyImage::~XmlReadOnlyImage()
-{
-}
-
-void XmlReadOnlyImage::RequestHelp( const HelpEvent& rHEvt )
-{
- if( Help::IsBalloonHelpEnabled() || Help::IsQuickHelpEnabled() )
- {
- Rectangle aLogicPix( LogicToPixel( Rectangle( Point(),
GetOutputSize() ) ) );
- Rectangle aScreenRect( OutputToScreenPixel( aLogicPix.TopLeft() ),
- OutputToScreenPixel(
aLogicPix.BottomRight() ) );
-
- OUString aStr(XmlReadOnlyImage::GetHelpTip());
- if ( Help::IsBalloonHelpEnabled() )
- Help::ShowBalloon( this, rHEvt.GetMousePosPixel(), aScreenRect,
- aStr );
- else if ( Help::IsQuickHelpEnabled() )
- Help::ShowQuickHelp( this, aScreenRect, aStr );
- }
- else
- Window::RequestHelp( rHEvt );
-}
-
-const OUString& XmlReadOnlyImage::GetHelpTip()
-{
- static OUString aStr(XMLSEC_RES( RID_XMLSECTP_READONLY_CONFIG_TIP));
- return aStr;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/dialogs/macrosecurity.src
b/xmlsecurity/source/dialogs/macrosecurity.src
deleted file mode 100644
index 16e2006..0000000
--- a/xmlsecurity/source/dialogs/macrosecurity.src
+++ /dev/null
@@ -1,37 +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 "dialogs.hrc"
-#include "helpids.hrc"
-
-String RID_XMLSECTP_READONLY_CONFIG_TIP
-{
- Text [ en-US ] = "This setting is protected by the Administrator";
-};
-
-Image RID_XMLSECTP_LOCK
-{
- ImageBitmap = Bitmap
- {
- File = "lock.bmp";
- };
- MaskColor = Color { Red=0xffff; Green=0x0000; Blue=0xffff; };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 8e06393ffc3502382d5f8c586d298d02190f9d24
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Jul 2 09:01:04 2013 +0100
remove post .ui conversion unused ResId loaders
Change-Id: Ib6a5455256f4712fc62554cbcbe279e9702d0552
diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx
index d2c933b..ac3e206 100644
--- a/include/svtools/ctrlbox.hxx
+++ b/include/svtools/ctrlbox.hxx
@@ -321,7 +321,6 @@ class SVT_DLLPUBLIC LineListBox : public ListBox
public:
LineListBox( Window* pParent, WinBits nWinStyle =
WB_BORDER );
- LineListBox( Window* pParent, const ResId& rResId );
virtual ~LineListBox();
/** Set the width in Twips */
diff --git a/include/svx/pagectrl.hxx b/include/svx/pagectrl.hxx
index 9a6e2ca..83f79f4 100644
--- a/include/svx/pagectrl.hxx
+++ b/include/svx/pagectrl.hxx
@@ -78,7 +78,6 @@ protected:
const sal_Bool bEnabled );
public:
- SvxPageWindow( Window* pParent, const ResId& rId );
SvxPageWindow( Window* pParent );
~SvxPageWindow();
diff --git a/include/svx/relfld.hxx b/include/svx/relfld.hxx
index 88fd808..c776516 100644
--- a/include/svx/relfld.hxx
+++ b/include/svx/relfld.hxx
@@ -39,7 +39,6 @@ protected:
void Modify();
public:
- SvxRelativeField( Window* pParent, const ResId& rResId );
SvxRelativeField( Window* pParent, WinBits nBits);
void EnableRelativeMode( sal_uInt16 nMin = 50, sal_uInt16 nMax
= 150,
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx
index 3d330ba..b325d78 100644
--- a/include/vcl/button.hxx
+++ b/include/vcl/button.hxx
@@ -562,7 +562,6 @@ protected:
SAL_DLLPRIVATE virtual void ImplDrawCheckBoxState();
public:
explicit DisclosureButton( Window* pParent, WinBits nStyle = 0 );
- explicit DisclosureButton( Window* pParent, const ResId& rResId );
virtual void KeyInput( const KeyEvent& rKEvt );
};
diff --git a/sc/source/ui/inc/optsolver.hxx b/sc/source/ui/inc/optsolver.hxx
index b731728..5de6171 100644
--- a/sc/source/ui/inc/optsolver.hxx
+++ b/sc/source/ui/inc/optsolver.hxx
@@ -42,7 +42,6 @@ class ScCursorRefEdit : public formula::RefEdit
Link maCursorDownLink;
public:
- ScCursorRefEdit( ScAnyRefDlg* pParent, Window *pLabel, const
ResId& rResId );
ScCursorRefEdit( Window* pParent, Window *pLabel );
void SetCursorLinks( const Link& rUp, const Link& rDown );
diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx
index 5a0c899..e49a4ee 100644
--- a/sc/source/ui/inc/tphfedit.hxx
+++ b/sc/source/ui/inc/tphfedit.hxx
@@ -55,7 +55,6 @@ enum ScEditWindowLocation
class SC_DLLPUBLIC ScEditWindow : public Control
{
public:
- ScEditWindow( Window* pParent, const ResId& rResId,
ScEditWindowLocation eLoc );
ScEditWindow( Window* pParent, WinBits nBits ,
ScEditWindowLocation eLoc );
~ScEditWindow();
@@ -119,7 +118,6 @@ protected:
public:
- ScExtIButton(Window* pParent, const ResId& rResId );
ScExtIButton(Window* pParent, WinBits nBits );
void SetPopupMenu(PopupMenu* pPopUp);
diff --git a/sc/source/ui/miscdlgs/optsolver.cxx
b/sc/source/ui/miscdlgs/optsolver.cxx
index d9bba10..7ad4602 100644
--- a/sc/source/ui/miscdlgs/optsolver.cxx
+++ b/sc/source/ui/miscdlgs/optsolver.cxx
@@ -117,11 +117,6 @@ ScSolverSuccessDialog::~ScSolverSuccessDialog()
//----------------------------------------------------------------------------
-ScCursorRefEdit::ScCursorRefEdit( ScAnyRefDlg* pParent, Window *pLabel, const
ResId& rResId ) :
- formula::RefEdit( pParent, pParent, pLabel, rResId )
-{
-}
-
ScCursorRefEdit::ScCursorRefEdit( Window* pParent, Window *pLabel )
: formula::RefEdit( pParent, pLabel )
{
diff --git a/sc/source/ui/pagedlg/tphfedit.cxx
b/sc/source/ui/pagedlg/tphfedit.cxx
index 255dad3..19731ff 100644
--- a/sc/source/ui/pagedlg/tphfedit.cxx
+++ b/sc/source/ui/pagedlg/tphfedit.cxx
@@ -72,44 +72,6 @@ static void lcl_GetFieldData( ScHeaderFieldData& rData )
// class ScEditWindow
//========================================================================
-ScEditWindow::ScEditWindow( Window* pParent, const ResId& rResId,
ScEditWindowLocation eLoc )
- : Control( pParent, rResId ),
- eLocation(eLoc),
- pAcc(NULL)
-{
- EnableRTL(false);
-
- const StyleSettings& rStyleSettings =
Application::GetSettings().GetStyleSettings();
- Color aBgColor = rStyleSettings.GetWindowColor();
-
- SetMapMode( MAP_TWIP );
- SetPointer( POINTER_TEXT );
- SetBackground( aBgColor );
-
- Size aSize( GetOutputSize() );
- aSize.Height() *= 4;
-
- pEdEngine = new ScHeaderEditEngine( EditEngine::CreatePool(), sal_True );
- pEdEngine->SetPaperSize( aSize );
- pEdEngine->SetRefDevice( this );
-
- ScHeaderFieldData aData;
- lcl_GetFieldData( aData );
-
- // Feldbefehle:
- pEdEngine->SetData( aData );
- pEdEngine->SetControlWord( pEdEngine->GetControlWord() |
EE_CNTRL_MARKFIELDS );
- mbRTL = ScGlobal::IsSystemRTL();
- if (mbRTL)
- pEdEngine->SetDefaultHorizontalTextDirection(EE_HTEXTDIR_R2L);
-
- pEdView = new EditView( pEdEngine, this );
- pEdView->SetOutputArea( Rectangle( Point(0,0), GetOutputSize() ) );
-
- pEdView->SetBackgroundColor( aBgColor );
- pEdEngine->InsertView( pEdView );
-}
-
ScEditWindow::ScEditWindow( Window* pParent, WinBits nBits,
ScEditWindowLocation eLoc )
: Control( pParent, nBits ),
eLocation(eLoc),
@@ -391,13 +353,6 @@ void ScEditWindow::LoseFocus()
return pAcc;
}
-ScExtIButton::ScExtIButton(Window* pParent, const ResId& rResId )
- : ImageButton(pParent,rResId), pPopupMenu(NULL)
-{
- nSelected=0;
- aTimer.SetTimeout(600);
- SetDropDown( true);
-}
ScExtIButton::ScExtIButton(Window* pParent, WinBits nBits )
: ImageButton(pParent,nBits), pPopupMenu(NULL)
{
diff --git a/svtools/source/control/ctrlbox.cxx
b/svtools/source/control/ctrlbox.cxx
index e5bab36..4d28a77 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -809,18 +809,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL
makeLineListBox(Window *pParent
// -----------------------------------------------------------------------
-LineListBox::LineListBox( Window* pParent, const ResId& rResId ) :
- ListBox( pParent, rResId ),
- m_nWidth( 5 ),
- m_sNone( ),
- aColor( COL_BLACK ),
- maPaintCol( COL_BLACK )
-{
- ImplInit();
-}
-
-// -----------------------------------------------------------------------
-
LineListBox::~LineListBox()
{
for ( size_t i = 0, n = pLineList->size(); i < n; ++i ) {
diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx
index f0bee35..055d9b9 100644
--- a/svx/source/dialog/pagectrl.cxx
+++ b/svx/source/dialog/pagectrl.cxx
@@ -57,47 +57,6 @@ struct PageWindow_Impl
// class SvxPageWindow ---------------------------------------------------
-SvxPageWindow::SvxPageWindow( Window* pParent, const ResId& rId ) :
-
- Window( pParent, rId ),
-
- nTop ( 0 ),
- nBottom ( 0 ),
- nLeft ( 0 ),
- nRight ( 0 ),
- aColor ( COL_TRANSPARENT ),
- nHdLeft ( 0 ),
- nHdRight ( 0 ),
- nHdDist ( 0 ),
- nHdHeight ( 0 ),
- aHdColor ( COL_TRANSPARENT ),
- pHdBorder ( 0 ),
- nFtLeft ( 0 ),
- nFtRight ( 0 ),
- nFtDist ( 0 ),
- nFtHeight ( 0 ),
- aFtColor ( COL_TRANSPARENT ),
- pFtBorder ( 0 ),
- bFooter ( sal_False ),
- bHeader ( sal_False ),
- bTable ( sal_False ),
- bHorz ( sal_False ),
- bVert ( sal_False ),
- eUsage ( SVX_PAGE_ALL )
-
-{
- pImpl = new PageWindow_Impl;
-
- // Count in Twips by default
- SetMapMode( MapMode( MAP_TWIP ) );
- aWinSize = GetOutputSizePixel();
- aWinSize.Height() -= 4;
- aWinSize.Width() -= 4;
-
- aWinSize = PixelToLogic( aWinSize );
- SetBackground();
-}
-
SvxPageWindow::SvxPageWindow( Window* pParent ) :
Window( pParent ),
diff --git a/svx/source/dialog/relfld.cxx b/svx/source/dialog/relfld.cxx
index 0665742..10da9a3 100644
--- a/svx/source/dialog/relfld.cxx
+++ b/svx/source/dialog/relfld.cxx
@@ -22,17 +22,6 @@
// -----------------------------------------------------------------------
-SvxRelativeField::SvxRelativeField( Window* pParent, const ResId& rResId ) :
- MetricField( pParent, rResId )
-{
- bNegativeEnabled = sal_False;
- bRelativeMode = sal_False;
- bRelative = sal_False;
-
- SetDecimalDigits( 2 );
- SetMin( 0 );
- SetMax( 9999 );
-}
SvxRelativeField::SvxRelativeField( Window* pParent, WinBits nBits) :
MetricField( pParent, nBits)
{
diff --git a/sw/source/ui/cctrl/actctrl.cxx b/sw/source/ui/cctrl/actctrl.cxx
index 05b3200..faef4e9 100644
--- a/sw/source/ui/cctrl/actctrl.cxx
+++ b/sw/source/ui/cctrl/actctrl.cxx
@@ -50,12 +50,6 @@ long NumEditAction::Notify( NotifyEvent& rNEvt )
return nHandled;
}
-NoSpaceEdit::NoSpaceEdit( Window* pParent, const ResId& rResId)
- : Edit(pParent, rResId)
- , sForbiddenChars(OUString(" "))
-{
-}
-
NoSpaceEdit::NoSpaceEdit(Window* pParent)
: Edit(pParent, WB_BORDER|WB_TABSTOP)
, sForbiddenChars(OUString(" "))
diff --git a/sw/source/ui/inc/actctrl.hxx b/sw/source/ui/inc/actctrl.hxx
index 2235166..383934f 100644
--- a/sw/source/ui/inc/actctrl.hxx
+++ b/sw/source/ui/inc/actctrl.hxx
@@ -52,7 +52,6 @@ protected:
virtual void Modify();
public:
- NoSpaceEdit( Window* pParent, const ResId& rResId);
NoSpaceEdit( Window* pParent );
virtual ~NoSpaceEdit();
void SetForbiddenChars(const String& rSet){sForbiddenChars =
rSet;}
@@ -65,11 +64,6 @@ public:
class TableNameEdit : public NoSpaceEdit
{
public:
- TableNameEdit(Window* pWin, const ResId& rResId)
- : NoSpaceEdit(pWin, rResId)
- {
- SetForbiddenChars(OUString(" .<>"));
- }
TableNameEdit(Window* pWin)
: NoSpaceEdit(pWin)
{
diff --git a/sw/source/ui/inc/colex.hxx b/sw/source/ui/inc/colex.hxx
index 6d786c1..9caeec1 100644
--- a/sw/source/ui/inc/colex.hxx
+++ b/sw/source/ui/inc/colex.hxx
@@ -31,12 +31,6 @@ class SfxItemSet;
class SW_DLLPUBLIC SwPageExample : public SvxPageWindow
{
public:
- SwPageExample(Window* pPar, const ResId& rResId)
- : SvxPageWindow(pPar, rResId)
- {
- SetSize(SvxPaperInfo::GetPaperSize(PAPER_A4));
- }
-
SwPageExample(Window* pPar)
: SvxPageWindow(pPar)
{
@@ -57,10 +51,6 @@ protected:
const sal_Bool bSecond,
const sal_Bool bEnabled );
public:
- SwPageGridExample(Window* pPar, const ResId& rResId ) :
- SwPageExample(pPar, rResId ),
- pGridItem(0),
- m_bVertical(false){}
SwPageGridExample(Window* pPar) :
SwPageExample(pPar),
pGridItem(0),
@@ -82,12 +72,6 @@ protected:
const sal_Bool bEnabled );
public:
- SwColExample(Window* pPar, const ResId& rResId)
- : SwPageExample(pPar, rResId)
- , pColMgr(0)
- {
- }
-
SwColExample(Window* pPar)
: SwPageExample(pPar)
, pColMgr(0)
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 6ee8944..a79088d 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -4093,11 +4093,6 @@ DisclosureButton::DisclosureButton( Window* pParent,
WinBits nStyle ) :
{
}
-DisclosureButton::DisclosureButton( Window* pParent, const ResId& rResId ) :
- CheckBox( pParent, rResId.SetRT( RSC_CHECKBOX ) )
-{
-}
-
// -----------------------------------------------------------------------
void DisclosureButton::ImplDrawCheckBoxState()
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
