include/svx/fmresids.hrc | 2
include/svx/imapdlg.hxx | 34 ++++------
svx/source/dialog/imapdlg.cxx | 9 --
svx/source/form/datanavi.src | 134 ------------------------------------------
svx/source/inc/datanavi.hrc | 16 -----
5 files changed, 17 insertions(+), 178 deletions(-)
New commits:
commit 2e359fbb18286d0f300c0267a188d82769d276de
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Dec 27 21:52:30 2013 +0000
drop converted RID_SVXDLG_ADD_SUBMISSION
Change-Id: Ice586c1dbe9adf52cdf8aa2b1a3fda8308f9da1e
diff --git a/include/svx/fmresids.hrc b/include/svx/fmresids.hrc
index 3991dd3..437294f 100644
--- a/include/svx/fmresids.hrc
+++ b/include/svx/fmresids.hrc
@@ -65,8 +65,6 @@
#define RID_SVXDLG_ADD_CONDITION (RID_FORMS_START + 13)
#define RID_SVXDLG_NAMESPACE_ITEM (RID_FORMS_START + 14)
-#define RID_SVXDLG_ADD_SUBMISSION (RID_FORMS_START + 16)
-
#define RID_SVXWIN_DATANAVIGATOR (RID_FORMS_START + 19)
#define RID_SVX_XFORMS_TABPAGES (RID_FORMS_START + 20)
diff --git a/svx/source/form/datanavi.src b/svx/source/form/datanavi.src
index 98255db..5b3f9aa 100644
--- a/svx/source/form/datanavi.src
+++ b/svx/source/form/datanavi.src
@@ -708,140 +708,6 @@ ModalDialog RID_SVXDLG_NAMESPACE_ITEM
};
};
-ModalDialog RID_SVXDLG_ADD_SUBMISSION
-{
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( 180 , 136 ) ;
- Text [ en-US ] = "Add Submission" ;
- Moveable = TRUE ;
- FixedLine FL_SUBMISSION
- {
- Pos = MAP_APPFONT ( 4 , 3 ) ;
- Size = MAP_APPFONT ( 172 , 8 ) ;
- Text [ en-US ] = "Submission" ;
- };
- FixedText FT_SUBMIT_NAME
- {
- Pos = MAP_APPFONT ( 6 , 16 ) ;
- Size = MAP_APPFONT ( 69 , 8 ) ;
- LeftLabel = TRUE ;
- Text [ en-US ] = "~Name" ;
- };
- Edit ED_SUBMIT_NAME
- {
- HelpID = "svx:Edit:RID_SVXDLG_ADD_SUBMISSION:ED_SUBMIT_NAME";
- Pos = MAP_APPFONT ( 78 , 14 ) ;
- Size = MAP_APPFONT ( 96 , 12 ) ;
- Border = TRUE ;
- };
- FixedText FT_SUBMIT_ACTION
- {
- Pos = MAP_APPFONT ( 6 , 31 ) ;
- Size = MAP_APPFONT ( 69 , 8 ) ;
- LeftLabel = TRUE ;
- Text [ en-US ] = "~Action" ;
- };
- Edit ED_SUBMIT_ACTION
- {
- HelpID = "svx:Edit:RID_SVXDLG_ADD_SUBMISSION:ED_SUBMIT_ACTION";
- Pos = MAP_APPFONT ( 78 , 29 ) ;
- Size = MAP_APPFONT ( 96 , 12 ) ;
- Border = TRUE ;
- };
- FixedText FT_SUBMIT_METHOD
- {
- Pos = MAP_APPFONT ( 6 , 46 ) ;
- Size = MAP_APPFONT ( 69 , 8 ) ;
- LeftLabel = TRUE ;
- Text [ en-US ] = "~Method" ;
- };
- ListBox LB_SUBMIT_METHOD
- {
- HelpID = "svx:ListBox:RID_SVXDLG_ADD_SUBMISSION:LB_SUBMIT_METHOD";
- Pos = MAP_APPFONT ( 78 , 44 ) ;
- Size = MAP_APPFONT ( 96 , 51 ) ;
- Border = TRUE ;
- DropDown = TRUE;
- };
- FixedText FT_SUBMIT_REF
- {
- Pos = MAP_APPFONT ( 6 , 62 ) ;
- Size = MAP_APPFONT ( 69 , 8 ) ;
- LeftLabel = TRUE ;
- Text [ en-US ] = "Binding e~xpression" ;
- };
- Edit ED_SUBMIT_REF
- {
- HelpID = "svx:Edit:RID_SVXDLG_ADD_SUBMISSION:ED_SUBMIT_REF";
- Pos = MAP_APPFONT ( 78 , 60 ) ;
- Size = MAP_APPFONT ( 79, 12 ) ;
- Border = TRUE ;
- };
- PushButton PB_SUBMIT_REF
- {
- HelpID = "svx:PushButton:RID_SVXDLG_ADD_SUBMISSION:PB_SUBMIT_REF";
- Pos = MAP_APPFONT ( 159 , 59 ) ;
- Size = MAP_APPFONT ( 14 , 14 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "~..." ;
- };
- FixedText FT_SUBMIT_BIND
- {
- Pos = MAP_APPFONT ( 6 , 77 ) ;
- Size = MAP_APPFONT ( 69 , 8 ) ;
- LeftLabel = TRUE ;
- Text [ en-US ] = "~Binding" ;
- };
- ListBox LB_SUBMIT_BIND
- {
- HelpID = "svx:ListBox:RID_SVXDLG_ADD_SUBMISSION:LB_SUBMIT_BIND";
- Pos = MAP_APPFONT ( 78 , 75 ) ;
- Size = MAP_APPFONT ( 96 , 51 ) ;
- Border = TRUE ;
- DropDown = TRUE;
- };
- FixedText FT_SUBMIT_REPLACE
- {
- Pos = MAP_APPFONT ( 6 , 92 ) ;
- Size = MAP_APPFONT ( 69 , 8 ) ;
- LeftLabel = TRUE ;
- Text [ en-US ] = "~Replace" ;
- };
- ListBox LB_SUBMIT_REPLACE
- {
- HelpID = "svx:ListBox:RID_SVXDLG_ADD_SUBMISSION:LB_SUBMIT_REPLACE";
- Pos = MAP_APPFONT ( 78 , 90 ) ;
- Size = MAP_APPFONT ( 96 , 51 ) ;
- Border = TRUE ;
- DropDown = TRUE;
- };
- FixedLine FL_DATANAV_BTN
- {
- Pos = MAP_APPFONT ( 4 , 105 ) ;
- Size = MAP_APPFONT ( 172 , 8 ) ;
- };
- OKButton BTN_DATANAV_OK
- {
- Pos = MAP_APPFONT ( 15 , 116 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- DefButton = TRUE ;
- };
- CancelButton BTN_DATANAV_ESC
- {
- Pos = MAP_APPFONT ( 68 , 116 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- };
- HelpButton BTN_DATANAV_HELP
- {
- Pos = MAP_APPFONT ( 124 , 116 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- };
-};
-
String RID_STR_METHOD_POST
{
Text [ en-US ] = "Post" ;
diff --git a/svx/source/inc/datanavi.hrc b/svx/source/inc/datanavi.hrc
index f8bd426..21057a6 100644
--- a/svx/source/inc/datanavi.hrc
+++ b/svx/source/inc/datanavi.hrc
@@ -126,22 +126,6 @@
#define STR_HEADER_PREFIX 10
#define STR_HEADER_URL 11
-// class AddSubmissionDialog
-#define FL_SUBMISSION 10
-#define FT_SUBMIT_NAME 11
-#define ED_SUBMIT_NAME 12
-#define FT_SUBMIT_ACTION 13
-#define ED_SUBMIT_ACTION 14
-#define FT_SUBMIT_METHOD 15
-#define LB_SUBMIT_METHOD 16
-#define FT_SUBMIT_REF 17
-#define ED_SUBMIT_REF 18
-#define PB_SUBMIT_REF 19
-#define FT_SUBMIT_BIND 20
-#define LB_SUBMIT_BIND 21
-#define FT_SUBMIT_REPLACE 22
-#define LB_SUBMIT_REPLACE 23
-
// class AddModelDialog
#define FL_MODEL 10
#define FT_MODEL_NAME 11
commit 0c577b7e2adc7410a39c526caf0e5adc02543dc0
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Dec 27 21:48:58 2013 +0000
remove nasty _IMAPDLG_PRIVATE foo
and untangle orthogonal Update method names
Change-Id: I3f9edb406c3e330a62f58eccf6fc23c210f3994e
diff --git a/include/svx/imapdlg.hxx b/include/svx/imapdlg.hxx
index 88a6ccf..0515a22 100644
--- a/include/svx/imapdlg.hxx
+++ b/include/svx/imapdlg.hxx
@@ -81,7 +81,6 @@ class SVX_DLLPUBLIC SvxIMapDlg : public SfxModelessDialog //
SfxFloatingWindow
{
friend class IMapOwnData;
friend class IMapWindow;
- using Window::Update;
ToolBox aTbxIMapDlg1;
FixedText aFtURL;
@@ -100,26 +99,21 @@ class SVX_DLLPUBLIC SvxIMapDlg : public SfxModelessDialog
// SfxFloatingWindow
SvxIMapDlgItem aIMapItem;
virtual void Resize();
- virtual sal_Bool Close();
-
-#ifdef _IMAPDLG_PRIVATE
-
- DECL_LINK( TbxClickHdl, ToolBox* );
- DECL_LINK( InfoHdl, IMapWindow* );
- DECL_LINK( MousePosHdl, IMapWindow* );
- DECL_LINK( GraphSizeHdl, IMapWindow* );
- DECL_LINK( URLModifyHdl, void* );
- DECL_LINK( URLLoseFocusHdl, void* );
- DECL_LINK(UpdateHdl, void *);
- DECL_LINK( TbxUpdateHdl, Timer* );
- DECL_LINK( StateHdl, IMapWindow* );
- DECL_LINK( MiscHdl, void* );
+ virtual sal_Bool Close();
+
+ DECL_LINK( TbxClickHdl, ToolBox* );
+ DECL_LINK( InfoHdl, IMapWindow* );
+ DECL_LINK( MousePosHdl, IMapWindow* );
+ DECL_LINK( GraphSizeHdl, IMapWindow* );
+ DECL_LINK( URLModifyHdl, void* );
+ DECL_LINK( URLLoseFocusHdl, void* );
+ DECL_LINK(UpdateHdl, void *);
+ DECL_LINK( TbxUpdateHdl, Timer* );
+ DECL_LINK( StateHdl, IMapWindow* );
+ DECL_LINK( MiscHdl, void* );
void DoOpen();
- sal_Bool DoSave();
-
-#endif
-
+ sal_Bool DoSave();
public:
@@ -139,7 +133,7 @@ public:
void SetTargetList( const TargetList& rTargetList );
- void Update( const Graphic& rGraphic, const ImageMap*
pImageMap = NULL,
+ void UpdateLink( const Graphic& rGraphic, const ImageMap*
pImageMap = NULL,
const TargetList* pTargetList = NULL, void*
pEditingObj = NULL );
virtual void KeyInput( const KeyEvent& rKEvt );
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index 3cc0bb63..8d74255 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -41,10 +41,7 @@
#include <unotools/localedatawrapper.hxx>
#include <comphelper/processfactory.hxx>
#include <vcl/layout.hxx>
-
-#define _IMAPDLG_PRIVATE
-#include "svx/imapdlg.hxx"
-
+#include <svx/imapdlg.hxx>
#include <svx/dialmgr.hxx>
#include <svx/dialogs.hrc>
#include <svx/svxids.hrc>
@@ -117,7 +114,7 @@ void SvxIMapDlgChildWindow::UpdateIMapDlg( const Graphic&
rGraphic, const ImageM
{
if ( SfxViewFrame::Current() &&
SfxViewFrame::Current()->HasChildWindow(
SvxIMapDlgChildWindow::GetChildWindowId() ) )
- SVXIMAPDLG()->Update( rGraphic, pImageMap, pTargetList, pEditingObj );
+ SVXIMAPDLG()->UpdateLink( rGraphic, pImageMap, pTargetList,
pEditingObj );
}
SvxIMapDlg::SvxIMapDlg( SfxBindings *_pBindings, SfxChildWindow *pCW,
@@ -286,7 +283,7 @@ void SvxIMapDlg::SetTargetList( const TargetList&
rTargetList )
maCbbTarget.InsertEntry( aNewList[ i ] );
}
-void SvxIMapDlg::Update( const Graphic& rGraphic, const ImageMap* pImageMap,
+void SvxIMapDlg::UpdateLink( const Graphic& rGraphic, const ImageMap*
pImageMap,
const TargetList* pTargetList, void* pEditingObj )
{
pOwnData->aUpdateGraphic = rGraphic;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
