tools/inc/tools/wintypes.hxx | 1 - vcl/inc/svids.hrc | 1 - vcl/inc/vcl/msgbox.hxx | 4 ---- vcl/source/src/btntext.src | 5 ----- vcl/source/window/msgbox.cxx | 14 -------------- 5 files changed, 25 deletions(-)
New commits: commit f6dcf2878a6d7a8cd3bd9761e2f03b085d2060cd Author: Tor Lillqvist <tlillqv...@suse.com> Date: Fri Mar 2 20:19:47 2012 +0200 Revert "Added 'Copy to Clipboard' button to error dialogs" The UI change was too intrusive. This reverts commit dfc9c72d7797862a9292bdda16ad8c107124a6df. diff --git a/tools/inc/tools/wintypes.hxx b/tools/inc/tools/wintypes.hxx index 7820669..e4f0a0d 100644 --- a/tools/inc/tools/wintypes.hxx +++ b/tools/inc/tools/wintypes.hxx @@ -336,7 +336,6 @@ typedef sal_uInt16 StandardButtonType; #define BUTTON_ABORT ((StandardButtonType)9) #define BUTTON_LESS ((StandardButtonType)10) #define BUTTON_COUNT 11 -#define BUTTON_COPY 12 // -------------------------------------------- // - prominent place for ListBox window types - diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc index e337bc7..5eba318 100644 --- a/vcl/inc/svids.hrc +++ b/vcl/inc/svids.hrc @@ -183,7 +183,6 @@ #define SV_BUTTONTEXT_IGNORE 10108 #define SV_BUTTONTEXT_ABORT 10109 #define SV_BUTTONTEXT_LESS 10110 -#define SV_BUTTONTEXT_COPY 10111 #define SV_STDTEXT_FIRST SV_STDTEXT_SERVICENOTAVAILABLE #define SV_STDTEXT_SERVICENOTAVAILABLE 10200 diff --git a/vcl/inc/vcl/msgbox.hxx b/vcl/inc/vcl/msgbox.hxx index 4e963a3..fb960b8 100644 --- a/vcl/inc/vcl/msgbox.hxx +++ b/vcl/inc/vcl/msgbox.hxx @@ -34,8 +34,6 @@ #include <vcl/btndlg.hxx> #include <vcl/image.hxx> #include <vcl/bitmap.hxx> -#include <vcl/button.hxx> - class FixedText; class FixedImage; class CheckBox; @@ -106,8 +104,6 @@ public: sal_Bool GetCheckBoxState() const; virtual Size GetOptimalSize(WindowSizeType eType) const; - - DECL_LINK( ClickHdl, void* ); }; // ----------- diff --git a/vcl/source/src/btntext.src b/vcl/source/src/btntext.src index 6762f08..c0303aa 100644 --- a/vcl/source/src/btntext.src +++ b/vcl/source/src/btntext.src @@ -69,11 +69,6 @@ String SV_BUTTONTEXT_LESS Text [ en-US ] = "~Less"; }; -String SV_BUTTONTEXT_COPY -{ - Text [ en-US ] = "Copy to Clipboard"; -}; - String SV_BUTTONTEXT_IGNORE { Text [ en-US ] = "~Ignore"; diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx index 220a067..4e5e796 100644 --- a/vcl/source/window/msgbox.cxx +++ b/vcl/source/window/msgbox.cxx @@ -34,7 +34,6 @@ #include <brdwin.hxx> #include <window.h> -#include <vcl/edit.hxx> #include <vcl/metric.hxx> #include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> @@ -400,10 +399,6 @@ void MessBox::ImplPosControls() mpCheckBox->Show(); } - AddButton( String( ResId( SV_BUTTONTEXT_COPY, *ImplGetResMgr() ) ), BUTTON_COPY, 0 ); - Button* pCopyBtn = GetPushButton( BUTTON_COPY ); - pCopyBtn->SetClickHdl( LINK( this, MessBox, ClickHdl ) ); - mpFixedText = new FixedText( this, nWinStyle ); if( mpFixedText->GetStyle() & WB_EXTRAOFFSET ) // TODO: use CalcMinimumSize() instead aFixedSize.Width() += 2; @@ -413,15 +408,6 @@ void MessBox::ImplPosControls() SetPageSizePixel( aPageSize ); } -IMPL_LINK_NOARG( MessBox, ClickHdl ) -{ - Edit aCopyHelper( this ); - aCopyHelper.SetText( maMessText, Selection( 0, maMessText.Len() ) ); - aCopyHelper.Copy(); - - return 0; -} - // ----------------------------------------------------------------------- void MessBox::StateChanged( StateChangedType nType ) _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits