summaryrefslogtreecommitdiff
path: root/vcl/inc/vcl
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/inc/vcl')
-rw-r--r--vcl/inc/vcl/builder.hxx14
-rw-r--r--vcl/inc/vcl/button.hxx7
-rw-r--r--vcl/inc/vcl/ctrl.hxx1
-rw-r--r--vcl/inc/vcl/edit.hxx1
-rw-r--r--vcl/inc/vcl/field.hxx5
-rw-r--r--vcl/inc/vcl/fixed.hxx2
-rw-r--r--vcl/inc/vcl/lstbox.hxx1
-rw-r--r--vcl/inc/vcl/spinfld.hxx1
-rw-r--r--vcl/inc/vcl/tabctrl.hxx3
-rw-r--r--vcl/inc/vcl/window.hxx5
10 files changed, 2 insertions, 38 deletions
diff --git a/vcl/inc/vcl/builder.hxx b/vcl/inc/vcl/builder.hxx
index fb47a0cb6b94..431d4bf22ba9 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 3d6c239a443d..af5d1826e589 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 0696bc3cc4c3..682038602785 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 3ad29cf2f544..3957f69471de 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 741656fa7015..c37b3067459e 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 e2d39f1ab9ee..94d70dc399de 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 a3a7dbb5cda4..f90a63e365a6 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 f773baa90680..578aebb1ea88 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 65884e12b46c..649ac315cc8d 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 6eabe159200b..e30391710ce5 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
//-------------------------------------
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-20 09:03:30 +0000