[Libreoffice-commits] .: 3 commits - sc/source vcl/inc vcl/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Dec 4 12:08:39 PST 2012
sc/source/ui/src/sortdlg.src | 1
vcl/inc/ilstbox.hxx | 10 --
vcl/inc/vcl/builder.hxx | 14 ---
vcl/inc/vcl/button.hxx | 7 -
vcl/inc/vcl/ctrl.hxx | 1
vcl/inc/vcl/edit.hxx | 1
vcl/inc/vcl/field.hxx | 5 -
vcl/inc/vcl/fixed.hxx | 2
vcl/inc/vcl/lstbox.hxx | 1
vcl/inc/vcl/spinfld.hxx | 1
vcl/inc/vcl/tabctrl.hxx | 3
vcl/inc/vcl/window.hxx | 5 -
vcl/source/control/button.cxx | 103 ---------------------------
vcl/source/control/ctrl.cxx | 15 ----
vcl/source/control/edit.cxx | 37 ---------
vcl/source/control/field.cxx | 51 -------------
vcl/source/control/fixed.cxx | 24 ------
vcl/source/control/ilstbox.cxx | 76 --------------------
vcl/source/control/lstbox.cxx | 29 -------
vcl/source/control/spinfld.cxx | 29 -------
vcl/source/control/tabctrl.cxx | 18 ----
vcl/source/window/builder.cxx | 83 +---------------------
vcl/source/window/dialog.cxx | 71 -------------------
vcl/source/window/printdlg.cxx | 1
vcl/source/window/tabpage.cxx | 11 --
vcl/source/window/window.cxx | 4 -
vcl/source/window/window2.cxx | 152 -----------------------------------------
27 files changed, 10 insertions(+), 745 deletions(-)
New commits:
commit 65e36f20761ff191816f9a7e32da750ca3001e45
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Dec 4 20:06:13 2012 +0000
sort printers
Change-Id: Idd9e10211eedbe23cabc92a7f1b1c0416fef480e
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 4776f39..0e63800 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -476,6 +476,7 @@ PrintDialog::JobTabPage::JobTabPage( VclBuilder* pUIBuilder )
, mnCollateUIMode( 0 )
{
pUIBuilder->get(mpPrinters, "printers");
+ mpPrinters->SetStyle(mpPrinters->GetStyle() | WB_SORT);
pUIBuilder->get(mpStatusTxt, "status");
pUIBuilder->get(mpLocationTxt, "location");
pUIBuilder->get(mpCommentTxt, "comment");
commit 0bde9091b00516096657cb7ed82898d486072355
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Dec 4 17:11:52 2012 +0000
remove ability to auto-replace .res widgets with .ui versions
it worked, and was sort of cool, but complicated and potentially fragile and
I've lost interest in maintaining it as a stepping stone towards full .ui
conversion in favour of just fully converted to .ui
Change-Id: I27cfd4061ef15cd691ac6ddaa7155afd025182ec
diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx
index 8a851af..93203f5 100644
--- a/vcl/inc/ilstbox.hxx
+++ b/vcl/inc/ilstbox.hxx
@@ -187,8 +187,6 @@ public:
first selectable entry after nPos is bForward is false.
*/
sal_uInt16 FindFirstSelectable( sal_uInt16 nPos, bool bForward = true );
-
- void take_properties(ImplEntryList &rOther);
};
// ---------------------
@@ -381,11 +379,6 @@ public:
inline void EnableMirroring() { mbMirroring = sal_True; }
inline sal_Bool IsMirroring() const { return mbMirroring; }
- /*
- * Takes ownership of the rOther properties
- */
- virtual void take_properties(Window &rOther);
-
protected:
// ISearchableStringList
virtual ::vcl::StringEntryIdentifier CurrentEntry( String& _out_entryText ) const;
@@ -513,8 +506,6 @@ public:
// pb: #106948# explicit mirroring for calc
inline void EnableMirroring() { maLBWindow.EnableMirroring(); }
inline void SetDropTraget(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& i_xDNDListenerContainer){ mxDNDListenerContainer= i_xDNDListenerContainer; }
-
- virtual void take_properties(Window &rOther);
};
// -----------------------------
@@ -620,7 +611,6 @@ public:
sal_Bool IsUserDrawEnabled() const { return mbUserDrawEnabled; }
void DrawEntry( sal_Bool bDrawImage, sal_Bool bDrawText, sal_Bool bDrawTextAtImagePos = sal_False, bool bLayout = false );
- virtual void take_properties(Window &rOther);
};
// -----------
diff --git a/vcl/inc/vcl/builder.hxx b/vcl/inc/vcl/builder.hxx
index fb47a0c..431d4bf 100644
--- a/vcl/inc/vcl/builder.hxx
+++ b/vcl/inc/vcl/builder.hxx
@@ -169,11 +169,6 @@ public:
}
OString get_by_window(const Window *pWindow) const;
void delete_by_window(const Window *pWindow);
- //for the purposes of retrofitting this to the existing code
- //look up sID, clone its properties into replacement and
- //splice replacement into the tree instead of it, without
- //taking ownership of it
- bool replace(OString sID, Window &rReplacement);
private:
Window *insertObject(Window *pParent, const OString &rClass, const OString &rID,
stringmap &rProps, stringmap &rPangoAttributes);
@@ -205,14 +200,12 @@ private:
PackingData get_window_packing_data(const Window *pWindow) const;
void set_window_packing_position(const Window *pWindow, sal_Int32 nPosition);
- //Helpers to retrofit all the existing code the the builder
- static void swapGuts(Window &rOrig, Window &rReplacement);
- static sal_uInt16 getPositionWithinParent(Window &rWindow);
+ //Helpers to retrofit all the existing code to the builder
static void reorderWithinParent(Window &rWindow, sal_uInt16 nNewPosition);
};
-//allows retro fitting existing dialogs/tabpages that load a resource
+//helper baseclass to ease retro fitting dialogs/tabpages that load a resource
//to load a .ui file instead
//
//vcl requires the Window Children of a Parent Window to be destroyed before
@@ -222,7 +215,6 @@ private:
//
//i.e. class Dialog : public SystemWindow, public VclBuilderContainer
//not class Dialog : public VclBuilderContainer, public SystemWindow
-class ResId;
class VCL_DLLPUBLIC VclBuilderContainer
{
@@ -232,8 +224,6 @@ public:
VclBuilderContainer();
virtual ~VclBuilderContainer();
static OUString getUIRootDir();
- static VclBuilder* overrideResourceWithUIXML(Window *pWindow, const ResId& rResId);
- static bool replace_buildable(Window *pParent, const ResId& rResId, Window &rReplacement);
template <typename T> T* get(T*& ret, OString sID)
{
return m_pUIBuilder->get<T>(ret, sID);
diff --git a/vcl/inc/vcl/button.hxx b/vcl/inc/vcl/button.hxx
index 3d6c239..af5d182 100644
--- a/vcl/inc/vcl/button.hxx
+++ b/vcl/inc/vcl/button.hxx
@@ -86,7 +86,6 @@ public:
void SetFocusRect( const Rectangle& rFocusRect );
bool IsSmallSymbol () const;
- virtual void take_properties(Window &rOther);
};
// --------------------
@@ -192,7 +191,6 @@ public:
void SetToggleHdl( const Link& rLink ) { maToggleHdl = rLink; }
const Link& GetToggleHdl() const { return maToggleHdl; }
virtual bool set_property(const rtl::OString &rKey, const rtl::OString &rValue);
- virtual void take_properties(Window &rOther);
};
inline void PushButton::Check( sal_Bool bCheck )
@@ -225,7 +223,6 @@ public:
OKButton( Window* pParent, const ResId& rResId );
virtual void Click();
- virtual void take_properties(Window &rOther);
};
// ----------------
@@ -248,7 +245,6 @@ public:
CancelButton( Window* pParent, const ResId& rResId );
virtual void Click();
- virtual void take_properties(Window &rOther);
};
// --------------
@@ -271,7 +267,6 @@ public:
HelpButton( Window* pParent, const ResId& rResId );
virtual void Click();
- virtual void take_properties(Window &rOther);
};
// ---------------
@@ -403,7 +398,6 @@ public:
* Group this RadioButton with another
*/
void group(RadioButton &rOther);
- virtual void take_properties(Window &rOther);
};
// ------------
@@ -455,7 +449,6 @@ protected:
SAL_DLLPRIVATE const Rectangle& GetStateRect() const { return maStateRect; }
SAL_DLLPRIVATE const Rectangle& GetMouseRect() const { return maMouseRect; }
- virtual void take_properties(Window &rOther);
public:
SAL_DLLPRIVATE void ImplCheck();
SAL_DLLPRIVATE void ImplSetMinimumNWFSize();
diff --git a/vcl/inc/vcl/ctrl.hxx b/vcl/inc/vcl/ctrl.hxx
index 0696bc3..6820386 100644
--- a/vcl/inc/vcl/ctrl.hxx
+++ b/vcl/inc/vcl/ctrl.hxx
@@ -188,7 +188,6 @@ public:
aFont.Merge( GetControlFont() );
return aFont;
}
- virtual void take_properties(Window &rOther);
};
#endif // _SV_CTRL_HXX
diff --git a/vcl/inc/vcl/edit.hxx b/vcl/inc/vcl/edit.hxx
index 3ad29cf..3957f69 100644
--- a/vcl/inc/vcl/edit.hxx
+++ b/vcl/inc/vcl/edit.hxx
@@ -247,7 +247,6 @@ public:
virtual rtl::OUString GetSurroundingText() const;
virtual Selection GetSurroundingTextSelection() const;
- virtual void take_properties(Window &rOther);
virtual bool set_property(const rtl::OString &rKey, const rtl::OString &rValue);
// returns the minimum size a bordered Edit should have given the current
diff --git a/vcl/inc/vcl/field.hxx b/vcl/inc/vcl/field.hxx
index 741656f..c37b306 100644
--- a/vcl/inc/vcl/field.hxx
+++ b/vcl/inc/vcl/field.hxx
@@ -210,8 +210,6 @@ public:
sal_Int64 Normalize( sal_Int64 nValue ) const;
sal_Int64 Denormalize( sal_Int64 nValue ) const;
-
- void take_properties(NumericFormatter &rOther);
};
// -------------------
@@ -271,8 +269,6 @@ public:
void SetCustomConvertHdl( const Link& rLink ) { maCustomConvertLink = rLink; }
const Link& GetCustomConvertHdl() const { return maCustomConvertLink; }
-
- void take_properties(MetricFormatter &rOther);
};
@@ -594,7 +590,6 @@ public:
{ return ConvertDoubleValue( static_cast<double>(nValue), nDecDigits, eInUnit, eOutUnit ); }
virtual bool set_property(const rtl::OString &rKey, const rtl::OString &rValue);
- virtual void take_properties(Window &rOther);
};
diff --git a/vcl/inc/vcl/fixed.hxx b/vcl/inc/vcl/fixed.hxx
index e2d39f1..94d70dc 100644
--- a/vcl/inc/vcl/fixed.hxx
+++ b/vcl/inc/vcl/fixed.hxx
@@ -73,7 +73,6 @@ public:
static Size getTextDimensions(Control const *pControl, const OUString &rTxt, long nMaxWidth);
Size CalcMinimumSize(long nMaxWidth = 0x7fffffff) const;
virtual Size GetOptimalSize(WindowSizeType eType) const;
- virtual void take_properties(Window &rOther);
virtual bool set_property(const rtl::OString &rKey, const rtl::OString &rValue);
};
@@ -109,7 +108,6 @@ public:
virtual void DataChanged( const DataChangedEvent& rDCEvt );
virtual Size GetOptimalSize(WindowSizeType eType) const;
- virtual void take_properties(Window &rOther);
};
// ---------------
diff --git a/vcl/inc/vcl/lstbox.hxx b/vcl/inc/vcl/lstbox.hxx
index a3a7dbb..f90a63e 100644
--- a/vcl/inc/vcl/lstbox.hxx
+++ b/vcl/inc/vcl/lstbox.hxx
@@ -217,7 +217,6 @@ public:
*/
using Control::GetIndexForPoint;
long GetIndexForPoint( const Point& rPoint, sal_uInt16& rPos ) const;
- virtual void take_properties(Window &rOther);
};
// ----------------
diff --git a/vcl/inc/vcl/spinfld.hxx b/vcl/inc/vcl/spinfld.hxx
index f773baa..578aebb 100644
--- a/vcl/inc/vcl/spinfld.hxx
+++ b/vcl/inc/vcl/spinfld.hxx
@@ -104,7 +104,6 @@ public:
virtual Size CalcMinimumSizeForText(const rtl::OUString &rString) const;
virtual Size GetOptimalSize(WindowSizeType eType) const;
virtual Size CalcSize( sal_uInt16 nChars ) const;
- virtual void take_properties(Window &rOther);
};
#endif // _SV_SPINFLD_HXX
diff --git a/vcl/inc/vcl/tabctrl.hxx b/vcl/inc/vcl/tabctrl.hxx
index 65884e1..649ac31 100644
--- a/vcl/inc/vcl/tabctrl.hxx
+++ b/vcl/inc/vcl/tabctrl.hxx
@@ -186,9 +186,6 @@ public:
// returns the rectangle of the tab for page nPageId
Rectangle GetTabBounds( sal_uInt16 nPageId ) const;
- // rename nOldId to nNewId);
- void ReassignPageId(sal_uInt16 nOldId, sal_uInt16 nNewId);
-
virtual void SetPosPixel(const Point& rPos);
virtual void SetSizePixel(const Size& rNewSize);
virtual void SetPosSizePixel(const Point& rNewPos, const Size& rNewSize);
diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx
index 6eabe15..e303917 100644
--- a/vcl/inc/vcl/window.hxx
+++ b/vcl/inc/vcl/window.hxx
@@ -1226,11 +1226,6 @@ public:
*/
void reorderWithinParent(sal_uInt16 nNewPosition);
- /*
- * Takes ownership of the rOther properties
- */
- virtual void take_properties(Window &rOther);
-
//-------------------------------------
// Native Widget Rendering functions
//-------------------------------------
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 2410ba3..63233c2 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -96,13 +96,6 @@ Button::Button( WindowType nType ) :
mpButtonData = new ImplCommonButtonData;
}
-void Button::take_properties(Window &rOther)
-{
- Control::take_properties(rOther);
- Button &rOtherButton = static_cast<Button&>(rOther);
- *mpButtonData = *rOtherButton.mpButtonData;
-}
-
// -----------------------------------------------------------------------
Button::~Button()
@@ -1209,10 +1202,6 @@ PushButton::PushButton( Window* pParent, const ResId& rResId ) :
{
rResId.SetRT( RSC_PUSHBUTTON );
WinBits nStyle = ImplInitRes( rResId );
-
- if (VclBuilderContainer::replace_buildable(pParent, rResId, *this))
- return;
-
ImplInitPushButtonData();
ImplInit( pParent, nStyle );
ImplLoadRes( rResId );
@@ -1221,17 +1210,6 @@ PushButton::PushButton( Window* pParent, const ResId& rResId ) :
Show();
}
-void PushButton::take_properties(Window &rOther)
-{
- if (!GetParent())
- {
- ImplInitPushButtonData();
- ImplInit(rOther.GetParent(), rOther.GetStyle());
- }
-
- Button::take_properties(rOther);
-}
-
// -----------------------------------------------------------------------
PushButton::~PushButton()
@@ -1781,10 +1759,6 @@ OKButton::OKButton( Window* pParent, const ResId& rResId ) :
{
rResId.SetRT( RSC_OKBUTTON );
WinBits nStyle = ImplInitRes( rResId );
-
- if (VclBuilderContainer::replace_buildable(pParent, rResId, *this))
- return;
-
ImplInit( pParent, nStyle );
ImplLoadRes( rResId );
@@ -1792,13 +1766,6 @@ OKButton::OKButton( Window* pParent, const ResId& rResId ) :
Show();
}
-void OKButton::take_properties(Window &rOther)
-{
- if (!GetParent())
- ImplInit(rOther.GetParent(), rOther.GetStyle());
- PushButton::take_properties(rOther);
-}
-
// -----------------------------------------------------------------------
void OKButton::Click()
@@ -1858,10 +1825,6 @@ CancelButton::CancelButton( Window* pParent, const ResId& rResId ) :
{
rResId.SetRT( RSC_CANCELBUTTON );
WinBits nStyle = ImplInitRes( rResId );
-
- if (VclBuilderContainer::replace_buildable(pParent, rResId, *this))
- return;
-
ImplInit( pParent, nStyle );
ImplLoadRes( rResId );
@@ -1869,13 +1832,6 @@ CancelButton::CancelButton( Window* pParent, const ResId& rResId ) :
Show();
}
-void CancelButton::take_properties(Window &rOther)
-{
- if (!GetParent())
- ImplInit(rOther.GetParent(), rOther.GetStyle());
- PushButton::take_properties(rOther);
-}
-
// -----------------------------------------------------------------------
void CancelButton::Click()
@@ -1935,10 +1891,6 @@ HelpButton::HelpButton( Window* pParent, const ResId& rResId ) :
{
rResId.SetRT( RSC_HELPBUTTON );
WinBits nStyle = ImplInitRes( rResId );
-
- if (VclBuilderContainer::replace_buildable(pParent, rResId, *this))
- return;
-
ImplInit( pParent, nStyle );
ImplLoadRes( rResId );
@@ -1946,13 +1898,6 @@ HelpButton::HelpButton( Window* pParent, const ResId& rResId ) :
Show();
}
-void HelpButton::take_properties(Window &rOther)
-{
- if (!GetParent())
- ImplInit(rOther.GetParent(), rOther.GetStyle());
- PushButton::take_properties(rOther);
-}
-
// -----------------------------------------------------------------------
void HelpButton::Click()
@@ -2512,10 +2457,6 @@ RadioButton::RadioButton( Window* pParent, const ResId& rResId ) :
{
rResId.SetRT( RSC_RADIOBUTTON );
WinBits nStyle = ImplInitRes( rResId );
-
- if (VclBuilderContainer::replace_buildable(pParent, rResId, *this))
- return;
-
ImplInitRadioButtonData();
ImplInit( pParent, nStyle );
ImplLoadRes( rResId );
@@ -2524,30 +2465,6 @@ RadioButton::RadioButton( Window* pParent, const ResId& rResId ) :
Show();
}
-void RadioButton::take_properties(Window &rOther)
-{
- if (!GetParent())
- {
- ImplInitRadioButtonData();
- ImplInit(rOther.GetParent(), rOther.GetStyle());
- }
-
- Button::take_properties(rOther);
-
- RadioButton &rOtherRadio = static_cast<RadioButton&>(rOther);
- if (rOtherRadio.m_xGroup.get())
- {
- rOtherRadio.m_xGroup->erase(std::remove(rOtherRadio.m_xGroup->begin(), rOtherRadio.m_xGroup->end(), &rOtherRadio),
- rOtherRadio.m_xGroup->end());
- rOtherRadio.m_xGroup->push_back(this);
- }
- std::swap(m_xGroup, rOtherRadio.m_xGroup);
- mbChecked = rOtherRadio.mbChecked;
- mbSaveValue = rOtherRadio.mbSaveValue;
- mbRadioCheck = rOtherRadio.mbRadioCheck;
- mbStateChanged = rOtherRadio.mbStateChanged;
-}
-
// -----------------------------------------------------------------------
void RadioButton::ImplLoadRes( const ResId& rResId )
@@ -3487,10 +3404,6 @@ CheckBox::CheckBox( Window* pParent, const ResId& rResId ) :
{
rResId.SetRT( RSC_CHECKBOX );
WinBits nStyle = ImplInitRes( rResId );
-
- if (VclBuilderContainer::replace_buildable(pParent, rResId, *this))
- return;
-
ImplInitCheckBoxData();
ImplInit( pParent, nStyle );
ImplLoadRes( rResId );
@@ -3499,22 +3412,6 @@ CheckBox::CheckBox( Window* pParent, const ResId& rResId ) :
Show();
}
-void CheckBox::take_properties(Window &rOther)
-{
- if (!GetParent())
- {
- ImplInitCheckBoxData();
- ImplInit(rOther.GetParent(), rOther.GetStyle());
- }
-
- Button::take_properties(rOther);
-
- CheckBox &rOtherCheck = static_cast<CheckBox&>(rOther);
- meState = rOtherCheck.meState;
- meSaveValue = rOtherCheck.meSaveValue;
- mbTriState = rOtherCheck.mbTriState;
-}
-
// -----------------------------------------------------------------------
void CheckBox::MouseButtonDown( const MouseEvent& rMEvt )
diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx
index e89e5c9..8ebd3eb 100644
--- a/vcl/source/control/ctrl.cxx
+++ b/vcl/source/control/ctrl.cxx
@@ -72,21 +72,6 @@ Control::Control( Window* pParent, const ResId& rResId ) :
Show();
}
-void Control::take_properties(Window &rOther)
-{
- if (!GetParent())
- {
- ImplInitControlData();
- ImplInit(rOther.GetParent(), rOther.GetStyle(), NULL);
- }
-
- Window::take_properties(rOther);
-
- Control &rOtherControl = static_cast<Control&>(rOther);
- std::swap(mpControlData, rOtherControl.mpControlData);
- mbHasControlFocus = rOtherControl.mbHasControlFocus;
-}
-
// -----------------------------------------------------------------------
Control::~Control()
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index a82a465..7d30f65 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -196,10 +196,6 @@ Edit::Edit( Window* pParent, const ResId& rResId ) :
{
rResId.SetRT( RSC_EDIT );
WinBits nStyle = ImplInitRes( rResId );
-
- if (VclBuilderContainer::replace_buildable(pParent, rResId, *this))
- return;
-
ImplInitEditData();
ImplInit( pParent, nStyle );
ImplLoadRes( rResId );
@@ -245,39 +241,6 @@ bool Edit::set_property(const rtl::OString &rKey, const rtl::OString &rValue)
return true;
}
-void Edit::take_properties(Window &rOther)
-{
- if (!GetParent())
- {
- ImplInitEditData();
- ImplInit(rOther.GetParent(), rOther.GetStyle());
- }
-
- Control::take_properties(rOther);
-
- Edit &rOtherEdit = static_cast<Edit&>(rOther);
- maText = rOtherEdit.maText;
- maPlaceholderText = rOtherEdit.maPlaceholderText;
- maSaveValue = rOtherEdit.maSaveValue;
- maUndoText = rOtherEdit.maUndoText;
- maRedoText = rOtherEdit.maRedoText;
- mnXOffset = rOtherEdit.mnXOffset;
- maSelection = rOtherEdit.maSelection;
- mnAlign = rOtherEdit.mnAlign;
- mnMaxTextLen = rOtherEdit.mnMaxTextLen;
- mnWidthInChars = rOtherEdit.mnWidthInChars;
- meAutocompleteAction = rOtherEdit.meAutocompleteAction;
- mcEchoChar = rOtherEdit.mcEchoChar;
- mbModified = rOtherEdit.mbModified;
- mbInternModified = rOtherEdit.mbInternModified;
- mbReadOnly = rOtherEdit.mbReadOnly;
- mbInsertMode = rOtherEdit.mbInsertMode;
- mbClickedInSelection = rOtherEdit.mbClickedInSelection;
- mbIsSubEdit = rOtherEdit.mbIsSubEdit;
- mbInMBDown = rOtherEdit.mbInMBDown;
- mbActivePopup = rOtherEdit.mbActivePopup;
-}
-
// -----------------------------------------------------------------------
Edit::Edit( Window* pParent, const ResId& rResId, bool bDisableAccessibleLabeledByRelation ) :
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 7350d30..9e5e99d 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -778,23 +778,6 @@ void NumericFormatter::ImplNewFieldValue( sal_Int64 nNewValue )
}
}
-void NumericFormatter::take_properties(NumericFormatter &rOther)
-{
- mnFieldValue = rOther.mnFieldValue;
- mnLastValue = rOther.mnLastValue;
- mnMin = rOther.mnMin;
- mnMax = rOther.mnMax;
- mnCorrectedValue = rOther.mnCorrectedValue;
- mnType = rOther.mnType;
- mnDecimalDigits = rOther.mnDecimalDigits;
- mbThousandSep = rOther.mbThousandSep;
- mbShowTrailingZeros = rOther.mbThousandSep;
-
- mnSpinSize = rOther.mnSpinSize;
- mnFirst = rOther.mnFirst;
- mnLast = rOther.mnLast;
-}
-
// -----------------------------------------------------------------------
NumericField::NumericField( Window* pParent, WinBits nWinStyle ) :
@@ -811,13 +794,6 @@ NumericField::NumericField( Window* pParent, const ResId& rResId ) :
{
rResId.SetRT( RSC_NUMERICFIELD );
WinBits nStyle = ImplInitRes( rResId ) ;
-
- if (VclBuilderContainer::replace_buildable(pParent, rResId, *this))
- {
- SetField( this );
- return;
- }
-
SpinField::ImplInit( pParent, nStyle );
SetField( this );
ImplLoadRes( rResId );
@@ -1730,10 +1706,6 @@ MetricField::MetricField( Window* pParent, const ResId& rResId ) :
{
rResId.SetRT( RSC_METRICFIELD );
WinBits nStyle = ImplInitRes( rResId ) ;
-
- if (VclBuilderContainer::replace_buildable(pParent, rResId, *this))
- return;
-
SpinField::ImplInit( pParent, nStyle );
SetField( this );
ImplLoadRes( rResId );
@@ -1747,29 +1719,6 @@ Size MetricField::CalcMinimumSize() const
return calcMinimumSize(*this, *this);
}
-void MetricFormatter::take_properties(MetricFormatter &rOtherField)
-{
- maCustomUnitText = rOtherField.maCustomUnitText;
- maCurUnitText = rOtherField.maCurUnitText;
- mnBaseValue = rOtherField.mnBaseValue;
- meUnit = rOtherField.meUnit;
- NumericFormatter::take_properties(rOtherField);
-}
-
-void MetricField::take_properties(Window &rOther)
-{
- if (!GetParent())
- {
- SpinField::ImplInit(rOther.GetParent(), rOther.GetStyle());
- SetField( this );
- }
-
- SpinField::take_properties(rOther);
-
- MetricField &rOtherField = static_cast<MetricField&>(rOther);
- MetricFormatter::take_properties(rOtherField);
-}
-
bool MetricField::set_property(const rtl::OString &rKey, const rtl::OString &rValue)
{
if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("format")))
diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx
index afd8e8a..982e3ec 100644
--- a/vcl/source/control/fixed.cxx
+++ b/vcl/source/control/fixed.cxx
@@ -162,10 +162,6 @@ FixedText::FixedText( Window* pParent, const ResId& rResId )
{
rResId.SetRT( RSC_TEXT );
WinBits nStyle = ImplInitRes( rResId );
-
- if (VclBuilderContainer::replace_buildable(pParent, rResId, *this))
- return;
-
ImplInit( pParent, nStyle );
ImplLoadRes( rResId );
@@ -173,14 +169,6 @@ FixedText::FixedText( Window* pParent, const ResId& rResId )
Show();
}
-void FixedText::take_properties(Window &rOther)
-{
- if (!GetParent())
- ImplInit(rOther.GetParent(), rOther.GetStyle());
-
- Control::take_properties(rOther);
-}
-
// -----------------------------------------------------------------------
FixedText::FixedText( Window* pParent, const ResId& rResId, bool bDisableAccessibleLabelForRelation )
@@ -647,10 +635,6 @@ FixedLine::FixedLine( Window* pParent, const ResId& rResId ) :
{
rResId.SetRT( RSC_FIXEDLINE );
WinBits nStyle = ImplInitRes( rResId );
-
- if (VclBuilderContainer::replace_buildable(pParent, rResId, *this))
- return;
-
ImplInit( pParent, nStyle );
ImplLoadRes( rResId );
@@ -658,14 +642,6 @@ FixedLine::FixedLine( Window* pParent, const ResId& rResId ) :
Show();
}
-void FixedLine::take_properties(Window &rOther)
-{
- if (!GetParent())
- ImplInit(rOther.GetParent(), rOther.GetStyle());
-
- Control::take_properties(rOther);
-}
-
// -----------------------------------------------------------------------
void FixedLine::FillLayoutData() const
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index e7bbca6..f070206 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -531,16 +531,6 @@ sal_uInt16 ImplEntryList::FindFirstSelectable( sal_uInt16 nPos, bool bForward /*
return LISTBOX_ENTRY_NOTFOUND;
}
-void ImplEntryList::take_properties(ImplEntryList &rOther)
-{
- mnLastSelected = rOther.mnLastSelected;
- mnSelectionAnchor = rOther.mnSelectionAnchor;
- mnImages = rOther.mnImages;
- mnMRUCount = rOther.mnMRUCount;
- mnMaxMRUCount = rOther.mnMaxMRUCount;
- maEntries.swap(rOther.maEntries);
-}
-
// =======================================================================
ImplListBoxWindow::ImplListBoxWindow( Window* pParent, WinBits nWinStyle ) :
@@ -588,52 +578,6 @@ ImplListBoxWindow::ImplListBoxWindow( Window* pParent, WinBits nWinStyle ) :
ImplCalcMetrics();
}
-void ImplListBoxWindow::take_properties(Window &rOther)
-{
- Control::take_properties(rOther);
-
- ImplListBoxWindow &rOtherListBoxWindow = static_cast<ImplListBoxWindow&>(rOther);
- mpEntryList->take_properties(*rOtherListBoxWindow.mpEntryList);
-
- maFocusRect = rOtherListBoxWindow.maFocusRect;
- maUserItemSize = rOtherListBoxWindow.maUserItemSize;
- mnMaxTxtHeight = rOtherListBoxWindow.mnMaxTxtHeight;
- mnMaxTxtWidth = rOtherListBoxWindow.mnMaxTxtWidth;
- mnMaxImgTxtWidth = rOtherListBoxWindow.mnMaxImgTxtWidth;
- mnMaxImgWidth = rOtherListBoxWindow.mnMaxImgWidth;
- mnMaxImgHeight = rOtherListBoxWindow.mnMaxImgHeight;
- mnMaxWidth = rOtherListBoxWindow.mnMaxWidth;
- mnMaxHeight = rOtherListBoxWindow.mnMaxHeight;
- mnCurrentPos = rOtherListBoxWindow.mnCurrentPos;
- mnTrackingSaveSelection = rOtherListBoxWindow.mnTrackingSaveSelection;
- mnSeparatorPos = rOtherListBoxWindow.mnSeparatorPos;
- mnUserDrawEntry = rOtherListBoxWindow.mnUserDrawEntry;
- mnTop = rOtherListBoxWindow.mnTop;
- mnLeft = rOtherListBoxWindow.mnLeft;
- mnBorder = rOtherListBoxWindow.mnBorder;
- mnTextHeight = rOtherListBoxWindow.mnTextHeight;
- meProminentType = rOtherListBoxWindow.meProminentType;
- mnSelectModifier = rOtherListBoxWindow.mnSelectModifier;
- mbHasFocusRect = rOtherListBoxWindow.mbHasFocusRect;
- mbSort = rOtherListBoxWindow.mbSort;
- mbTrack = rOtherListBoxWindow.mbTrack;
- mbMulti = rOtherListBoxWindow.mbMulti;
- mbStackMode = rOtherListBoxWindow.mbStackMode;
- mbSimpleMode = rOtherListBoxWindow.mbSimpleMode;
- mbImgsDiffSz = rOtherListBoxWindow.mbImgsDiffSz;
- mbTravelSelect = rOtherListBoxWindow.mbTravelSelect;
- mbTrackingSelect = rOtherListBoxWindow.mbTrackingSelect;
- mbSelectionChanged = rOtherListBoxWindow.mbSelectionChanged;
- mbMouseMoveSelect = rOtherListBoxWindow.mbMouseMoveSelect;
- mbGrabFocus = rOtherListBoxWindow.mbGrabFocus;
- mbUserDrawEnabled = rOtherListBoxWindow.mbUserDrawEnabled;
- mbInUserDraw = rOtherListBoxWindow.mbInUserDraw;
- mbReadOnly = rOtherListBoxWindow.mbReadOnly;
- mbMirroring = rOtherListBoxWindow.mbMirroring;
- mbRight = rOtherListBoxWindow.mbRight;
- mbCenter = rOtherListBoxWindow.mbCenter;
-}
-
// -----------------------------------------------------------------------
ImplListBoxWindow::~ImplListBoxWindow()
@@ -2298,14 +2242,6 @@ ImplListBox::ImplListBox( Window* pParent, WinBits nWinStyle ) :
maLBWindow.Show();
}
-void ImplListBox::take_properties(Window &rOther)
-{
- Control::take_properties(rOther);
-
- ImplListBox &rOtherListBoxWindow = static_cast<ImplListBox&>(rOther);
- maLBWindow.take_properties(rOtherListBoxWindow.maLBWindow);
-}
-
// -----------------------------------------------------------------------
ImplListBox::~ImplListBox()
@@ -2787,18 +2723,6 @@ ImplWin::ImplWin( Window* pParent, WinBits nWinStyle ) :
mnItemPos = LISTBOX_ENTRY_NOTFOUND;
}
-void ImplWin::take_properties(Window &rOther)
-{
- Control::take_properties(rOther);
-
- ImplWin &rOtherImplWin = static_cast<ImplWin&>(rOther);
- mnItemPos = rOtherImplWin.mnItemPos;
- maString = rOtherImplWin.maString;
- maImage = rOtherImplWin.maImage;
- maFocusRect = rOtherImplWin.maFocusRect;
- maUserItemSize = rOtherImplWin.maUserItemSize;
-};
-
// -----------------------------------------------------------------------
void ImplWin::MBDown()
diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx
index 8675c5a..94f58d1 100644
--- a/vcl/source/control/lstbox.cxx
+++ b/vcl/source/control/lstbox.cxx
@@ -60,39 +60,14 @@ ListBox::ListBox( Window* pParent, const ResId& rResId ) :
{
rResId.SetRT( RSC_LISTBOX );
WinBits nStyle = ImplInitRes( rResId );
-
- if (VclBuilderContainer::replace_buildable(pParent, rResId, *this))
- return;
-
ImplInitListBoxData();
ImplInit( pParent, nStyle );
-
ImplLoadRes( rResId );
if ( !(nStyle & WB_HIDE ) )
Show();
}
-void ListBox::take_properties(Window &rOther)
-{
- if (!GetParent())
- {
- ImplInitListBoxData();
- ImplInit(rOther.GetParent(), rOther.GetStyle());
- }
-
- Control::take_properties(rOther);
-
- ListBox &rOtherListBox = static_cast<ListBox&>(rOther);
- mnDDHeight = rOtherListBox.mnDDHeight;
- mnSaveValue = rOtherListBox.mnSaveValue;
- EnableAutoSize(rOtherListBox.mbDDAutoSize);
- SetDropDownLineCount(rOtherListBox.GetDropDownLineCount());
- mpImplLB->take_properties(*rOtherListBox.mpImplLB);
- if (mpImplWin && rOtherListBox.mpImplWin)
- mpImplWin->take_properties(*rOtherListBox.mpImplWin);
-}
-
// -----------------------------------------------------------------------
ListBox::~ListBox()
@@ -1580,10 +1555,6 @@ MultiListBox::MultiListBox( Window* pParent, const ResId& rResId ) :
{
rResId.SetRT( RSC_MULTILISTBOX );
WinBits nStyle = ImplInitRes( rResId );
-
- if (VclBuilderContainer::replace_buildable(pParent, rResId, *this))
- return;
-
ImplInit( pParent, nStyle );
ImplLoadRes( rResId );
diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx
index 47aa197..cba366d 100644
--- a/vcl/source/control/spinfld.cxx
+++ b/vcl/source/control/spinfld.cxx
@@ -365,35 +365,6 @@ SpinField::SpinField( Window* pParent, const ResId& rResId ) :
Show();
}
-void SpinField::take_properties(Window &rOther)
-{
- if (!GetParent())
- {
- ImplInitSpinFieldData();
- ImplInit(rOther.GetParent(), rOther.GetStyle());
- }
-
- Edit::take_properties(rOther);
-
- SpinField &rOtherField = static_cast<SpinField&>(rOther);
- assert(mpEdit && rOtherField.mpEdit);
- mpEdit->take_properties(*rOtherField.mpEdit);
-
- maUpperRect = rOtherField.maUpperRect;
- maLowerRect = rOtherField.maLowerRect;
- maDropDownRect = rOtherField.maDropDownRect;
- mbRepeat = rOtherField.mbRepeat;
- mbSpin = rOtherField.mbSpin;
- mbInitialUp = rOtherField.mbInitialUp;
- mbInitialDown = rOtherField.mbInitialDown;
- mbNoSelect = rOtherField.mbNoSelect;
- mbUpperIn = rOtherField.mbUpperIn;
- mbLowerIn = rOtherField.mbLowerIn;
- mbInDropDown = rOtherField.mbInDropDown;
-}
-
-
-
// --------------------------------------------------------------------
SpinField::~SpinField()
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index 4e1afc2..7efd292 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -2218,22 +2218,4 @@ Size TabControl::GetOptimalSize(WindowSizeType eType) const
return calculateRequisition();
}
-// -----------------------------------------------------------------------
-
-void TabControl::ReassignPageId(sal_uInt16 nOldId, sal_uInt16 nNewId)
-{
- for( std::vector< ImplTabItem >::iterator it = mpTabCtrlData->maItemList.begin();
- it != mpTabCtrlData->maItemList.end(); ++it )
- {
- if( it->mnId == nOldId )
- it->mnId = nNewId;
- }
-
- if (mnActPageId == nOldId)
- mnActPageId = nNewId;
-
- if (mnCurPageId == nOldId)
- mnCurPageId = nOldId;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 5b4b5e2..e5711e9 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -586,13 +586,10 @@ Window *VclBuilder::makeObject(Window *pParent, const OString &name, const OStri
{
//We have to add a page
- //make default pageid == -position. Partitioning the
- //id space into negative numbers for auto-generated
- //ids and positive numbers for the handleTabChild
- //derived ids
+ //make default pageid == position
TabControl *pTabControl = static_cast<TabControl*>(pParent);
sal_uInt16 nNewPageCount = pTabControl->GetPageCount()+1;
- sal_uInt16 nNewPageId = -nNewPageCount;
+ sal_uInt16 nNewPageId = nNewPageCount;
pTabControl->InsertPage(nNewPageId, OUString());
pTabControl->SetCurPageId(nNewPageId);
@@ -944,31 +941,6 @@ Window *VclBuilder::insertObject(Window *pParent, const OString &rClass,
return pCurrentChild;
}
-sal_uInt16 VclBuilder::getPositionWithinParent(Window &rWindow)
-{
- if (rWindow.mpWindowImpl->mpParent != rWindow.mpWindowImpl->mpRealParent)
- {
- assert(rWindow.mpWindowImpl->mpBorderWindow ==
- rWindow.mpWindowImpl->mpParent);
- assert(rWindow.mpWindowImpl->mpBorderWindow->mpWindowImpl->mpParent ==
- rWindow.mpWindowImpl->mpRealParent);
- return getPositionWithinParent(*rWindow.mpWindowImpl->mpBorderWindow);
- }
-
- assert(rWindow.GetParent() == rWindow.mpWindowImpl->mpRealParent);
-
- sal_uInt16 nPosition = 0;
- Window* pChild = rWindow.GetParent()->mpWindowImpl->mpFirstChild;
- while (pChild)
- {
- if (pChild == &rWindow)
- break;
- pChild = pChild->mpWindowImpl->mpNext;
- ++nPosition;
- }
- return nPosition;
-}
-
void VclBuilder::reorderWithinParent(Window &rWindow, sal_uInt16 nNewPosition)
{
if (rWindow.mpWindowImpl->mpParent != rWindow.mpWindowImpl->mpRealParent)
@@ -1036,24 +1008,8 @@ void VclBuilder::handleTabChild(Window *pParent, xmlreader::XmlReader &reader)
VclBuilder::stringmap::iterator aFind = aProperties.find(OString("label"));
if (aFind != aProperties.end())
{
- pTabControl->SetPageText(pTabControl->GetCurPageId(), OStringToOUString(aFind->second, RTL_TEXTENCODING_UTF8));
-
- sal_Int32 nID = 0;
- //To make it easier to retro fit pre-builder dialog code we take the
- //notebook child id (falling back to notebook label id) and if its a
- //positive number use that as the page id so existing code can find the
- //right tabpage by id
- TabPage *pPage = pTabControl->GetTabPage(pTabControl->GetCurPageId());
- if (pPage)
- {
- VclBin *pContainer = static_cast<VclBin*>(pPage->GetWindow(WINDOW_FIRSTCHILD));
- Window *pChild = pContainer->get_child();
- nID = pChild ? get_by_window(pChild).toInt32() : 0;
- }
- if (nID == 0)
- nID = sID.toInt32();
- if (nID > 0)
- pTabControl->ReassignPageId(pTabControl->GetCurPageId(), nID);
+ pTabControl->SetPageText(pTabControl->GetCurPageId(),
+ OStringToOUString(aFind->second, RTL_TEXTENCODING_UTF8));
}
else
pTabControl->RemovePage(pTabControl->GetCurPageId());
@@ -1701,37 +1657,6 @@ const VclBuilder::Adjustment *VclBuilder::get_adjustment_by_name(OString sID) co
return NULL;
}
-void VclBuilder::swapGuts(Window &rOrig, Window &rReplacement)
-{
- sal_uInt16 nPosition = getPositionWithinParent(rOrig);
-
- rReplacement.take_properties(rOrig);
-
- reorderWithinParent(rReplacement, nPosition);
-
- assert(nPosition == getPositionWithinParent(rReplacement));
-}
-
-bool VclBuilder::replace(OString sID, Window &rReplacement)
-{
- for (std::vector<WinAndId>::iterator aI = m_aChildren.begin(),
- aEnd = m_aChildren.end(); aI != aEnd; ++aI)
- {
- if (aI->m_sID.equals(sID))
- {
- Window *pOrig = aI->m_pWindow;
- swapGuts(*pOrig, rReplacement);
- delete pOrig;
-
- aI->m_pWindow = &rReplacement;
- aI->m_bOwned = false;
- return true;
- }
- }
- SAL_WARN("vcl.layout", "no sign of :" << sID.getStr());
- return false;
-}
-
void VclBuilder::mungeModel(ListBox &rTarget, const ListStore &rStore)
{
for (std::vector<ListStore::row>::const_iterator aI = rStore.m_aEntries.begin(), aEnd = rStore.m_aEntries.end();
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 3ef0f44..24da8ef 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -540,41 +540,12 @@ Dialog::Dialog( Window* pParent, WinBits nStyle )
ImplInit( pParent, nStyle );
}
-VclBuilder* VclBuilderContainer::overrideResourceWithUIXML(Window *pWindow, const ResId& rResId)
-{
- sal_Int32 nUIid = static_cast<sal_Int32>(rResId.GetId());
-
- rtl::OUString sRoot = getUIRootDir();
- rtl::OUString sPath = rtl::OUStringBuffer(
- rResId.GetResMgr()->getPrefixName()).
- append("/ui/").
- append(nUIid).
- appendAscii(".ui").
- makeStringAndClear();
-
- osl::File aUIFile(sRoot + sPath);
- osl::File::RC error = aUIFile.open(osl_File_OpenFlag_Read);
- //good, use the preferred GtkBuilder xml
- if (error == osl::File::E_None)
- return new VclBuilder(pWindow, sRoot, sPath, rtl::OString::valueOf(nUIid));
- return NULL;
-}
-
WinBits Dialog::init(Window *pParent, const ResId& rResId)
{
WinBits nStyle = ImplInitRes( rResId );
ImplInit( pParent, nStyle );
-
- m_pUIBuilder = overrideResourceWithUIXML(this, rResId);
-
- if (m_pUIBuilder)
- loadAndSetJustHelpID(rResId);
- else
- {
- //fallback to using the binary resource file
- ImplLoadRes( rResId );
- }
+ ImplLoadRes( rResId );
return nStyle;
}
@@ -1254,46 +1225,6 @@ VclBuilderContainer::~VclBuilderContainer()
delete m_pUIBuilder;
}
-bool VclBuilderContainer::replace_buildable(Window *pParent, const ResId& rResId, Window &rReplacement)
-{
- if (!pParent)
- return false;
-
- VclBuilderContainer *pBuilderContainer = dynamic_cast<VclBuilderContainer*>(pParent);
- if (!pBuilderContainer)
- return false;
-
- VclBuilder *pUIBuilder = pBuilderContainer->m_pUIBuilder;
- if (!pUIBuilder)
- return false;
-
- sal_Int32 nID = rResId.GetId();
-
- bool bFound = pUIBuilder->replace(rtl::OString::valueOf(nID), rReplacement);
- if (bFound)
- {
- rReplacement.loadAndSetJustHelpID(rResId);
- }
- else
- {
- SAL_WARN("vcl.layout", "widget " << nID << " " << &rReplacement << " not found, hiding");
- //move "missing" elements into the action area (just to have
- //a known container as an owner) and hide it
- Window* pArbitraryParent;
- if (pParent->IsDialog())
- {
- Dialog *pDialog = static_cast<Dialog*>(pParent);
- pArbitraryParent = getActionArea(pDialog);
- }
- else
- pArbitraryParent = pParent->GetWindow(WINDOW_FIRSTCHILD);
- rReplacement.ImplInit(pArbitraryParent, 0, NULL);
- rReplacement.Hide();
- }
-
- return true;
-}
-
// -----------------------------------------------------------------------
ModelessDialog::ModelessDialog( Window* pParent, const ResId& rResId ) :
diff --git a/vcl/source/window/tabpage.cxx b/vcl/source/window/tabpage.cxx
index 3546c4f..5f04373 100644
--- a/vcl/source/window/tabpage.cxx
+++ b/vcl/source/window/tabpage.cxx
@@ -89,16 +89,7 @@ TabPage::TabPage( Window* pParent, const ResId& rResId ) :
rResId.SetRT( RSC_TABPAGE );
WinBits nStyle = ImplInitRes( rResId );
ImplInit( pParent, nStyle );
-
- m_pUIBuilder = overrideResourceWithUIXML(this, rResId);
-
- if (m_pUIBuilder)
- loadAndSetJustHelpID(rResId);
- else
- {
- //fallback to using the binary resource file
- ImplLoadRes(rResId);
- }
+ ImplLoadRes(rResId);
if ( !(nStyle & WB_HIDE) )
Show();
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index bf7da99..15b8e8f 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -4207,10 +4207,6 @@ Window::Window( Window* pParent, const ResId& rResId )
rResId.SetRT( RSC_WINDOW );
WinBits nStyle = ImplInitRes( rResId );
-
- if (VclBuilderContainer::replace_buildable(pParent, rResId, *this))
- return;
-
ImplInitWindowData( WINDOW_WINDOW );
ImplInit( pParent, nStyle, NULL );
ImplLoadRes( rResId );
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 0459a5b..051dfec 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -1779,158 +1779,6 @@ void Window::queue_resize()
pDialog->queue_layout();
}
-//We deliberately do not overwrite our maHelpId here
-//so that the .res loaded id is not overwritten
-//by the .ui loaded one
-void Window::take_properties(Window &rOther)
-{
- if (!mpWindowImpl)
- {
- ImplInitWindowData(WINDOW_WINDOW);
- ImplInit(rOther.GetParent(), rOther.GetStyle(), NULL);
- }
-
- WindowImpl *pWindowImpl = rOther.mpWindowImpl;
- if (!mpWindowImpl->mpRealParent)
- ImplInit(pWindowImpl->mpRealParent, rOther.GetStyle(), NULL);
- std::swap(mpWindowImpl->mpUserData, pWindowImpl->mpUserData);
- std::swap(mpWindowImpl->mpCursor, pWindowImpl->mpCursor);
- std::swap(mpWindowImpl->maPointer, pWindowImpl->maPointer);
- mpWindowImpl->maZoom = pWindowImpl->maZoom;
- mpWindowImpl->maText = pWindowImpl->maText;
- std::swap(mpWindowImpl->mpControlFont, pWindowImpl->mpControlFont);
- mpWindowImpl->maControlForeground = pWindowImpl->maControlForeground;
- mpWindowImpl->maControlBackground = pWindowImpl->maControlBackground;
- mpWindowImpl->mnLeftBorder = pWindowImpl->mnLeftBorder;
- mpWindowImpl->mnTopBorder = pWindowImpl->mnTopBorder;
- mpWindowImpl->mnRightBorder = pWindowImpl->mnRightBorder;
- mpWindowImpl->mnBottomBorder = pWindowImpl->mnBottomBorder;
- mpWindowImpl->mnWidthRequest = pWindowImpl->mnWidthRequest;
- mpWindowImpl->mnHeightRequest = pWindowImpl->mnHeightRequest;
- mpWindowImpl->mnX = pWindowImpl->mnX;
- mpWindowImpl->mnY = pWindowImpl->mnY;
- mpWindowImpl->mnAbsScreenX = pWindowImpl->mnAbsScreenX;
- mpWindowImpl->maPos = pWindowImpl->maPos;
- mpWindowImpl->maUniqId = pWindowImpl->maUniqId;
- mpWindowImpl->maHelpText = pWindowImpl->maHelpText;
- mpWindowImpl->maQuickHelpText = pWindowImpl->maQuickHelpText;
- std::swap(mpWindowImpl->maInputContext, pWindowImpl->maInputContext);
- mpWindowImpl->mnStyle = pWindowImpl->mnStyle;
- mpWindowImpl->mnPrevStyle = pWindowImpl->mnPrevStyle;
- mpWindowImpl->mnExtendedStyle = pWindowImpl->mnExtendedStyle;
- mpWindowImpl->mnPrevExtendedStyle = pWindowImpl->mnPrevExtendedStyle;
- mpWindowImpl->mnType = pWindowImpl->mnType;
- mpWindowImpl->mnNativeBackground = pWindowImpl->mnNativeBackground;
- mpWindowImpl->mnWaitCount = pWindowImpl->mnWaitCount;
- mpWindowImpl->mnPaintFlags = pWindowImpl->mnPaintFlags;
- mpWindowImpl->mnGetFocusFlags = pWindowImpl->mnGetFocusFlags;
- mpWindowImpl->mnParentClipMode = pWindowImpl->mnParentClipMode;
- mpWindowImpl->mnActivateMode = pWindowImpl->mnActivateMode;
- mpWindowImpl->mnDlgCtrlFlags = pWindowImpl->mnDlgCtrlFlags;
- mpWindowImpl->mnLockCount = pWindowImpl->mnLockCount;
- mpWindowImpl->meAlwaysInputMode = pWindowImpl->meAlwaysInputMode;
- mpWindowImpl->meHalign = pWindowImpl->meHalign;
- mpWindowImpl->meValign = pWindowImpl->meValign;
- mpWindowImpl->mePackType = pWindowImpl->mePackType;
- mpWindowImpl->mnPadding = pWindowImpl->mnPadding;
- mpWindowImpl->mnGridHeight = pWindowImpl->mnGridHeight;
- mpWindowImpl->mnGridLeftAttach = pWindowImpl->mnGridLeftAttach;
- mpWindowImpl->mnGridTopAttach = pWindowImpl->mnGridTopAttach;
- mpWindowImpl->mnGridWidth = pWindowImpl->mnGridWidth;
- mpWindowImpl->mnBorderWidth = pWindowImpl->mnBorderWidth;
- mpWindowImpl->mnMarginLeft = pWindowImpl->mnMarginLeft;
- mpWindowImpl->mnMarginRight = pWindowImpl->mnMarginRight;
- mpWindowImpl->mnMarginTop = pWindowImpl->mnMarginTop;
- mpWindowImpl->mnMarginBottom = pWindowImpl->mnMarginBottom;
- mpWindowImpl->mbFrame = pWindowImpl->mbFrame;
- mpWindowImpl->mbBorderWin = pWindowImpl->mbBorderWin;
- mpWindowImpl->mbOverlapWin = pWindowImpl->mbOverlapWin;
- mpWindowImpl->mbSysWin = pWindowImpl->mbSysWin;
- mpWindowImpl->mbDialog = pWindowImpl->mbDialog;
- mpWindowImpl->mbDockWin = pWindowImpl->mbDockWin;
- mpWindowImpl->mbFloatWin = pWindowImpl->mbFloatWin;
- mpWindowImpl->mbPushButton = pWindowImpl->mbPushButton;
- mpWindowImpl->mbVisible = pWindowImpl->mbVisible;
- mpWindowImpl->mbDisabled = pWindowImpl->mbDisabled;
- mpWindowImpl->mbInputDisabled = pWindowImpl->mbInputDisabled;
- mpWindowImpl->mbDropDisabled = pWindowImpl->mbDropDisabled;
- mpWindowImpl->mbNoUpdate = pWindowImpl->mbNoUpdate;
- mpWindowImpl->mbNoParentUpdate = pWindowImpl->mbNoParentUpdate;
- mpWindowImpl->mbActive = pWindowImpl->mbActive;
- mpWindowImpl->mbParentActive = pWindowImpl->mbParentActive;
- mpWindowImpl->mbReallyVisible = pWindowImpl->mbReallyVisible;
- mpWindowImpl->mbReallyShown = pWindowImpl->mbReallyShown;
- mpWindowImpl->mbInInitShow = pWindowImpl->mbInInitShow;
- mpWindowImpl->mbChildNotify = pWindowImpl->mbChildNotify;
- mpWindowImpl->mbChildPtrOverwrite = pWindowImpl->mbChildPtrOverwrite;
- mpWindowImpl->mbNoPtrVisible = pWindowImpl->mbNoPtrVisible;
- mpWindowImpl->mbPaintFrame = pWindowImpl->mbPaintFrame;
- mpWindowImpl->mbInPaint = pWindowImpl->mbInPaint;
- mpWindowImpl->mbMouseMove = pWindowImpl->mbMouseMove;
- mpWindowImpl->mbMouseButtonDown = pWindowImpl->mbMouseButtonDown;
- mpWindowImpl->mbMouseButtonUp = pWindowImpl->mbMouseButtonUp;
- mpWindowImpl->mbKeyInput = pWindowImpl->mbKeyInput;
- mpWindowImpl->mbKeyUp = pWindowImpl->mbKeyUp;
- mpWindowImpl->mbCommand = pWindowImpl->mbCommand;
- mpWindowImpl->mbDefPos = pWindowImpl->mbDefPos;
- mpWindowImpl->mbDefSize = pWindowImpl->mbDefSize;
- mpWindowImpl->mbCallMove = pWindowImpl->mbCallMove;
- mpWindowImpl->mbCallResize = pWindowImpl->mbCallResize;
- mpWindowImpl->mbWaitSystemResize = pWindowImpl->mbWaitSystemResize;
- mpWindowImpl->mbInitWinClipRegion = pWindowImpl->mbInitWinClipRegion;
- mpWindowImpl->mbInitChildRegion = pWindowImpl->mbInitChildRegion;
- mpWindowImpl->mbWinRegion = pWindowImpl->mbWinRegion;
- mpWindowImpl->mbClipChildren = pWindowImpl->mbClipChildren;
- mpWindowImpl->mbClipSiblings = pWindowImpl->mbClipSiblings;
- mpWindowImpl->mbChildTransparent = pWindowImpl->mbChildTransparent;
- mpWindowImpl->mbPaintTransparent = pWindowImpl->mbPaintTransparent;
- mpWindowImpl->mbMouseTransparent = pWindowImpl->mbMouseTransparent;
- mpWindowImpl->mbDlgCtrlStart = pWindowImpl->mbDlgCtrlStart;
- mpWindowImpl->mbFocusVisible = pWindowImpl->mbFocusVisible;
- mpWindowImpl->mbTrackVisible = pWindowImpl->mbTrackVisible;
- mpWindowImpl->mbUseNativeFocus = pWindowImpl->mbUseNativeFocus;
- mpWindowImpl->mbNativeFocusVisible = pWindowImpl->mbNativeFocusVisible;
- mpWindowImpl->mbInShowFocus = pWindowImpl->mbInShowFocus;
- mpWindowImpl->mbInHideFocus = pWindowImpl->mbInHideFocus;
- mpWindowImpl->mbControlForeground = pWindowImpl->mbControlForeground;
- mpWindowImpl->mbControlBackground = pWindowImpl->mbControlBackground;
- mpWindowImpl->mbAlwaysOnTop = pWindowImpl->mbAlwaysOnTop;
- mpWindowImpl->mbCompoundControl = pWindowImpl->mbCompoundControl;
- mpWindowImpl->mbCompoundControlHasFocus = pWindowImpl->mbCompoundControlHasFocus;
- mpWindowImpl->mbPaintDisabled = pWindowImpl->mbPaintDisabled;
- mpWindowImpl->mbAllResize = pWindowImpl->mbAllResize;
- mpWindowImpl->mbInDtor = pWindowImpl->mbInDtor;
- mpWindowImpl->mbExtTextInput = pWindowImpl->mbExtTextInput;
- mpWindowImpl->mbInFocusHdl = pWindowImpl->mbInFocusHdl;
- mpWindowImpl->mbOverlapVisible = pWindowImpl->mbOverlapVisible;
- mpWindowImpl->mbCreatedWithToolkit = pWindowImpl->mbCreatedWithToolkit;
- mpWindowImpl->mbToolBox = pWindowImpl->mbToolBox;
- mpWindowImpl->mbSplitter = pWindowImpl->mbSplitter;
- mpWindowImpl->mbSuppressAccessibilityEvents = pWindowImpl->mbSuppressAccessibilityEvents;
- mpWindowImpl->mbMenuFloatingWindow = pWindowImpl->mbMenuFloatingWindow;
- mpWindowImpl->mbDrawSelectionBackground = pWindowImpl->mbDrawSelectionBackground;
- mpWindowImpl->mbIsInTaskPaneList = pWindowImpl->mbIsInTaskPaneList;
- mpWindowImpl->mbToolbarFloatingWindow = pWindowImpl->mbToolbarFloatingWindow;
- mpWindowImpl->mbCallHandlersDuringInputDisabled = pWindowImpl->mbCallHandlersDuringInputDisabled;
- mpWindowImpl->mbDisableAccessibleLabelForRelation = pWindowImpl->mbDisableAccessibleLabelForRelation;
- mpWindowImpl->mbDisableAccessibleLabeledByRelation = pWindowImpl->mbDisableAccessibleLabeledByRelation;
- mpWindowImpl->mbHelpTextDynamic = pWindowImpl->mbHelpTextDynamic;
- mpWindowImpl->mbFakeFocusSet = pWindowImpl->mbFakeFocusSet;
- mpWindowImpl->mbHexpand = pWindowImpl->mbHexpand;
- mpWindowImpl->mbVexpand = pWindowImpl->mbVexpand;
- mpWindowImpl->mbExpand = pWindowImpl->mbExpand;
- mpWindowImpl->mbFill = pWindowImpl->mbFill;
- mpWindowImpl->mbSecondary = pWindowImpl->mbSecondary;
-
- bool bHasBorderWindow = mpWindowImpl->mpBorderWindow;
- bool bOtherHasBorderWindow = pWindowImpl->mpBorderWindow;
-
- assert(bHasBorderWindow == bOtherHasBorderWindow);
-
- if (bHasBorderWindow && bOtherHasBorderWindow)
- mpWindowImpl->mpBorderWindow->take_properties(*pWindowImpl->mpBorderWindow);
-}
-
namespace
{
VclAlign toAlign(const OString &rValue)
commit 839272421fcf4c7bd1ebb0e526fb1476a0cb84c6
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Dec 4 16:35:59 2012 +0000
sort dialog can be resizeable now
Change-Id: Ied1969d849c08f450bf826fb24624cd9fa54695a
diff --git a/sc/source/ui/src/sortdlg.src b/sc/source/ui/src/sortdlg.src
index 5f66957..b26763e 100644
--- a/sc/source/ui/src/sortdlg.src
+++ b/sc/source/ui/src/sortdlg.src
@@ -81,6 +81,7 @@ TabDialog RID_SCDLG_SORT
Size = MAP_APPFONT ( 220 , 175 ) ;
Text [ en-US ] = "Sort" ;
Moveable = TRUE ;
+ Sizeable = TRUE ;
Closeable = FALSE ;
TabControl 1
{
More information about the Libreoffice-commits
mailing list