include/svx/measctrl.hxx | 1 include/vcl/button.hxx | 1 svx/source/dialog/measctrl.cxx | 29 --------- sw/UIConfig_swriter.mk | 1 sw/inc/helpid.h | 1 sw/source/ui/dbui/mmaddressblockpage.src | 1 sw/uiconfig/swriter/ui/selectblockdialog.ui | 88 ++++++++++++++++++++++++++++ unusedcode.easy | 6 + vcl/source/control/button.cxx | 16 ----- vcl/source/control/tabctrl.cxx | 2 10 files changed, 95 insertions(+), 51 deletions(-)
New commits: commit 767a65d9dd11308cb8f1384f80a7aab8c7ff5a38 Author: Caolán McNamara <caol...@redhat.com> Date: Sat Sep 14 14:00:06 2013 +0100 callcatcher: update unused code list No TriStateBoxes are loaded from .res files anymore. Change-Id: Ie897dc9a46a4e09e7fb1160a5bd4a65c63ba7979 diff --git a/include/svx/measctrl.hxx b/include/svx/measctrl.hxx index fde082f..bfb925b 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 cb6f7e8..b3550bc 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 1a630ee..e63d0be 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 2b6498b..8004805 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 32d70f3..73b1ed4 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() { } commit addf8139b7672e3264515be6d0ce51cdf43754c9 Author: Caolán McNamara <caol...@redhat.com> Date: Fri Sep 13 20:43:12 2013 +0100 convert select address block to .ui Change-Id: I5fc1d70e91b1b2ba48f749292feb474230082def diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk index 7993a08..b118f47 100644 --- a/sw/UIConfig_swriter.mk +++ b/sw/UIConfig_swriter.mk @@ -174,6 +174,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\ sw/uiconfig/swriter/ui/sectionpage \ sw/uiconfig/swriter/ui/selectaddressdialog \ sw/uiconfig/swriter/ui/selectautotextdialog \ + sw/uiconfig/swriter/ui/selectblockdialog \ sw/uiconfig/swriter/ui/selectindexdialog \ sw/uiconfig/swriter/ui/sidebarpage \ sw/uiconfig/swriter/ui/sidebarwrap \ diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h index 53689ef..34f861e 100644 --- a/sw/inc/helpid.h +++ b/sw/inc/helpid.h @@ -379,7 +379,6 @@ #define HID_MM_SELECTDBTABLEDDIALOG_LISTBOX "SW_HID_MM_SELECTDBTABLEDDIALOG_LISTBOX" #define HID_MM_DBTABLEPREVIEWDIALOG "SW_HID_MM_DBTABLEPREVIEWDIALOG" #define HID_MM_CREATEADDRESSLIST "SW_HID_MM_CREATEADDRESSLIST" -#define HID_MM_SELECTADDRESSBLOCK "SW_HID_MM_SELECTADDRESSBLOCK" #define HID_MM_ASSIGNFIELDS "SW_HID_MM_ASSIGNFIELDS" #define HID_MM_LAYOUT_PAGE "SW_HID_MM_LAYOUT_PAGE" #define HID_MM_COPYTO "SW_HID_MM_COPYTO" diff --git a/sw/source/ui/dbui/mmaddressblockpage.src b/sw/source/ui/dbui/mmaddressblockpage.src index 6b39d3a..1f80f0c 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.src +++ b/sw/source/ui/dbui/mmaddressblockpage.src @@ -190,7 +190,6 @@ ModalDialog DLG_MM_SELECTADDRESSBLOCK { OutputSize = TRUE ; SVLook = TRUE ; - HelpID = HID_MM_SELECTADDRESSBLOCK; Size = MAP_APPFONT ( 260 , 219 ) ; Moveable = TRUE ; diff --git a/sw/uiconfig/swriter/ui/selectblockdialog.ui b/sw/uiconfig/swriter/ui/selectblockdialog.ui new file mode 100644 index 0000000..4abafd4 --- /dev/null +++ b/sw/uiconfig/swriter/ui/selectblockdialog.ui @@ -0,0 +1,88 @@ +<?xml version="1.0" encoding="UTF-8"?> +<interface> + <!-- interface-requires gtk+ 3.0 --> + <object class="GtkDialog" id="SelectBlockDialog"> + <property name="can_focus">False</property> + <property name="border_width">6</property> + <property name="title" translatable="yes">Select Address Block</property> + <property name="type_hint">dialog</property> + <child internal-child="vbox"> + <object class="GtkBox" id="dialog-vbox1"> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">12</property> + <child internal-child="action_area"> + <object class="GtkButtonBox" id="dialog-action_area1"> + <property name="can_focus">False</property> + <property name="layout_style">end</property> + <child> + <object class="GtkButton" id="ok"> + <property name="label">gtk-ok</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="has_default">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="cancel"> + <property name="label">gtk-cancel</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="help"> + <property name="label">gtk-help</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> + <child> + <placeholder/> + </child> + </object> + </child> + <action-widgets> + <action-widget response="0">ok</action-widget> + <action-widget response="0">cancel</action-widget> + <action-widget response="0">help</action-widget> + </action-widgets> + </object> + <object class="GtkSizeGroup" id="sizegroup1"> + <property name="mode">both</property> + <widgets> + <widget name="addressdest:border"/> + <widget name="addrpreview:border"/> + </widgets> + </object> +</interface> commit 9995222d1141b326197a387cc7897b3971ce9e9a Author: Caolán McNamara <caol...@redhat.com> Date: Fri Sep 13 20:15:11 2013 +0100 make right click menu in tab headers checkboxes not radiobuttons Change-Id: I99d1edc18e2acb7ae0ea0c6397777ea0f00d81f9 diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index e6e4aba..3504b90 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -1543,7 +1543,7 @@ void TabControl::Command( const CommandEvent& rCEvt ) for( std::vector< ImplTabItem >::iterator it = mpTabCtrlData->maItemList.begin(); it != mpTabCtrlData->maItemList.end(); ++it ) { - aMenu.InsertItem( it->mnId, it->maText, MIB_CHECKABLE | MIB_RADIOCHECK ); + aMenu.InsertItem( it->mnId, it->maText, MIB_CHECKABLE ); if ( it->mnId == mnCurPageId ) aMenu.CheckItem( it->mnId ); aMenu.SetHelpId( it->mnId, it->maHelpId );
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits