diff options
| -rw-r--r-- | include/svx/measctrl.hxx | 1 | ||||
| -rw-r--r-- | include/vcl/button.hxx | 1 | ||||
| -rw-r--r-- | svx/source/dialog/measctrl.cxx | 29 | ||||
| -rw-r--r-- | unusedcode.easy | 6 | ||||
| -rw-r--r-- | vcl/source/control/button.cxx | 16 |
5 files changed, 5 insertions, 48 deletions
diff --git a/include/svx/measctrl.hxx b/include/svx/measctrl.hxx index fde082fbb7e7..bfb925b5b7cc 100644 --- a/include/svx/measctrl.hxx +++ b/include/svx/measctrl.hxx @@ -41,7 +41,6 @@ private: SdrModel* pModel; public: - SvxXMeasurePreview(Window* pParent, const ResId& rResId, const SfxItemSet& rInAttrs); SvxXMeasurePreview(Window* pParent, WinBits nStyle); ~SvxXMeasurePreview(); diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx index cb6f7e8c8c9a..b3550bcae3dc 100644 --- a/include/vcl/button.hxx +++ b/include/vcl/button.hxx @@ -551,7 +551,6 @@ class VCL_DLLPUBLIC TriStateBox : public CheckBox public: explicit TriStateBox( Window* pParent, WinBits nStyle = 0 ); - explicit TriStateBox( Window* pParent, const ResId& ); virtual ~TriStateBox(); }; diff --git a/svx/source/dialog/measctrl.cxx b/svx/source/dialog/measctrl.cxx index 1a630eeb3236..e63d0befdef0 100644 --- a/svx/source/dialog/measctrl.cxx +++ b/svx/source/dialog/measctrl.cxx @@ -25,35 +25,6 @@ #include "svx/dlgutil.hxx" #include <vcl/builder.hxx> -SvxXMeasurePreview::SvxXMeasurePreview( Window* pParent,const ResId& rResId,const SfxItemSet& rInAttrs) -: Control ( pParent, rResId ) - -{ - SetMapMode( MAP_100TH_MM ); - - Size aSize = GetOutputSize(); - - // Scale: 1:2 - MapMode aMapMode = GetMapMode(); - aMapMode.SetScaleX( Fraction( 1, 2 ) ); - aMapMode.SetScaleY( Fraction( 1, 2 ) ); - SetMapMode( aMapMode ); - - aSize = GetOutputSize(); - Point aPt1 = Point( aSize.Width() / 5, (long) ( aSize.Height() / 2 ) ); - Point aPt2 = Point( aSize.Width() * 4 / 5, (long) ( aSize.Height() / 2 ) ); - - pMeasureObj = new SdrMeasureObj( aPt1, aPt2 ); - pModel = new SdrModel(); - pMeasureObj->SetModel( pModel ); - - pMeasureObj->SetMergedItemSetAndBroadcast(rInAttrs); - - SetDrawMode( GetSettings().GetStyleSettings().GetHighContrastMode() ? OUTPUT_DRAWMODE_CONTRAST : OUTPUT_DRAWMODE_COLOR ); - - Invalidate(); -} - SvxXMeasurePreview::SvxXMeasurePreview( Window* pParent, WinBits nStyle) : Control(pParent, nStyle) { diff --git a/unusedcode.easy b/unusedcode.easy index 2b6498be26be..800480533272 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -6,6 +6,7 @@ CodeCompleteDataCache::GetVars() const CodeCompleteDataCache::SetVars(boost::unordered::unordered_map<rtl::OUString, boost::unordered::unordered_map<rtl::OUString, rtl::OUString, rtl::OUStringHash, std::equal_to<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, rtl::OUString> > >, rtl::OUStringHash, std::equal_to<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, boost::unordered::unordered_map<rtl::OUString, rtl::OUString, rtl::OUStringHash, std::equal_to<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, rtl::OUString> > > > > > const&) CodeCompleteDataCache::print() const +CuiAboutConfigTabPage::LinkStubHeaderSelect_Impl(void*, void*) EditTextObjectImpl::SetParaAttribs(int, SfxItemSet const&) FontSelectPatternAttributes::FontSelectPatternAttributes(PhysicalFontFace const&, Size const&, float, int, bool) ImplRegionBand::IsInside(long, long) @@ -55,6 +56,8 @@ SfxAppMenuControl_Impl::RegisterControl(unsigned short, SfxModule*) SfxGrabBagItem::SetGrabBag(std::__debug::map<rtl::OUString, com::sun::star::uno::Any, std::less<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, com::sun::star::uno::Any> > > const&) SfxTemplatePanelControl::SetParagraphFamily() SmFontPickList::Contains(Font const&) const +SmParser::Insert(rtl::OUString const&, int) +String::Search(unsigned short const*, unsigned short) const SvdProgressInfo::ReportError() SvpSalInstance::PostEvent(SalFrame const*, void*, unsigned short) SvpSalInstance::PostedEventsInQueue() @@ -117,7 +120,6 @@ connectivity::sdbcx::OGroup::OGroup(unsigned char) drawinglayer::attribute::SdrFillGraphicAttribute::getLogSize() const editeng::MisspellRange::MisspellRange() editeng::Section::Section() -formula::DoubleVectorRefToken::GetArrayLength() const formula::FormulaDlg::CheckMatrix() formula::SingleVectorRefToken::SingleVectorRefToken(double const*, unsigned long) framework::MenuBarManager::getComponentContext() @@ -128,6 +130,7 @@ oox::drawingml::TextListStyle::dump() const oox::xls::BiffDrawingObjectBase::BiffDrawingObjectBase(oox::xls::WorksheetHelper const&) oox::xls::WorksheetGlobals::getColumns(oox::ValueRange const&) const oox::xls::WorksheetGlobals::getRows(oox::ValueRange const&) const +rtl_OUString::convertFromString::test() sc::CellTextAttr::CellTextAttr(unsigned short, unsigned char) sc::ColumnSet::has(short, short) const sc::sidebar::CellLineStyleValueSet::SetImage(Image) @@ -158,6 +161,7 @@ std::auto_ptr<formula::FormulaTokenArray>::auto_ptr(std::auto_ptr<formula::Formu std::auto_ptr<formula::FormulaTokenArray>::auto_ptr(std::auto_ptr_ref<formula::FormulaTokenArray>) svx::DialControl::GetModifyHdl() const svx::sidebar::LineWidthControl::GetValueSet() +unoidl::SourceProvider::SourceProvider(rtl::Reference<unoidl::Manager> const&, rtl::OUString const&) unoidl::UnoidlProvider::getConstant(unsigned int) const utl::toISO8601(com::sun::star::util::Time const&) vclmain::createApplication() diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index 32d70f37b055..73b1ed401b90 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -4104,22 +4104,6 @@ TriStateBox::TriStateBox( Window* pParent, WinBits nStyle ) : // ----------------------------------------------------------------------- -TriStateBox::TriStateBox( Window* pParent, const ResId& rResId ) : - CheckBox( pParent, rResId.SetRT( RSC_TRISTATEBOX ) ) -{ - EnableTriState( sal_True ); - - sal_uLong nTriState = ReadLongRes(); - sal_uInt16 bDisableTriState = ReadShortRes(); - //anderer Wert als Default ? - if ( (TriState)nTriState != STATE_NOCHECK ) - SetState( (TriState)nTriState ); - if ( bDisableTriState ) - EnableTriState( sal_False ); -} - -// ----------------------------------------------------------------------- - TriStateBox::~TriStateBox() { } |