You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2022/09/27 21:50:52 UTC
[openoffice] branch AOO41X updated (29b78537aa -> e9b3637dc0)
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a change to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
from 29b78537aa Proposed fix for Issue 60217 (#155)
new 2fdc5d6fc6 Cleanup resource file
new e9b3637dc0 Add fixed line in dialog
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
main/sw/source/ui/fldui/changedb.cxx | 1 +
main/sw/source/ui/fldui/changedb.hrc | 37 ++++++++-------
main/sw/source/ui/fldui/changedb.src | 87 +++++++++++++++++++-----------------
main/sw/source/ui/inc/changedb.hxx | 32 ++++++-------
4 files changed, 82 insertions(+), 75 deletions(-)
[openoffice] 01/02: Cleanup resource file
Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 2fdc5d6fc6aaf4c7f2620df4f010af1406553c52
Author: mseidel <ms...@apache.org>
AuthorDate: Tue Sep 27 23:49:47 2022 +0200
Cleanup resource file
---
main/sw/source/ui/fldui/changedb.src | 82 ++++++++++++++++++------------------
1 file changed, 41 insertions(+), 41 deletions(-)
diff --git a/main/sw/source/ui/fldui/changedb.src b/main/sw/source/ui/fldui/changedb.src
index fa4fde6eb8..7bbe153546 100644
--- a/main/sw/source/ui/fldui/changedb.src
+++ b/main/sw/source/ui/fldui/changedb.src
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -27,81 +27,81 @@
ModalDialog DLG_CHANGE_DB
{
- HelpID = "sw:ModalDialog:DLG_CHANGE_DB";
+ HelpID = "sw:ModalDialog:DLG_CHANGE_DB" ;
OutputSize = TRUE ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 286 , 175 ) ;
-
+ Size = MAP_APPFONT ( 286, 175 ) ;
+
Text [ en-US ] = "Exchange Databases" ;
Moveable = TRUE ;
- FixedLine FL_DBLIST
+ FixedLine FL_DBLIST
{
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 218 , 8 ) ;
+ Pos = MAP_APPFONT ( 6, 3 ) ;
+ Size = MAP_APPFONT ( 218, 8 ) ;
Text [ en-US ] = "Exchange databases" ;
};
FixedText FT_USEDDB
{
- Pos = MAP_APPFONT ( 12 , 14 ) ;
- Size = MAP_APPFONT ( 90 , 8 ) ;
+ Pos = MAP_APPFONT ( 12, 14 ) ;
+ Size = MAP_APPFONT ( 90, 8 ) ;
Left = TRUE ;
Text [ en-US ] = "Databases in Use" ;
};
FixedText FT_AVAILDB
{
- Pos = MAP_APPFONT ( 118 , 14 ) ;
- Size = MAP_APPFONT ( 90 , 8 ) ;
+ Pos = MAP_APPFONT ( 118, 14 ) ;
+ Size = MAP_APPFONT ( 90, 8 ) ;
Left = TRUE ;
Text [ en-US ] = "Available Databases" ;
};
Control TLB_USEDDB
{
Border = TRUE ;
- Pos = MAP_APPFONT ( 12 , 25 ) ;
- Size = MAP_APPFONT ( 100 , 62 ) ;
+ Pos = MAP_APPFONT ( 12, 25 ) ;
+ Size = MAP_APPFONT ( 100, 62 ) ;
TabStop = TRUE ;
};
Control TLB_AVAILDB
{
Border = TRUE ;
- Pos = MAP_APPFONT ( 118 , 25 ) ;
- Size = MAP_APPFONT ( 100 , 62 ) ;
+ Pos = MAP_APPFONT ( 118, 25 ) ;
+ Size = MAP_APPFONT ( 100, 62 ) ;
TabStop = TRUE ;
};
- PushButton PB_ADDDB
- {
- HelpID = "sw:PushButton:DLG_CHANGE_DB:PB_ADDDB";
- Pos = MAP_APPFONT ( 118 , 90 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- Text [ en-US ] = "Browse..." ;
- };
- FixedText FT_DESC
+ PushButton PB_ADDDB
+ {
+ HelpID = "sw:PushButton:DLG_CHANGE_DB:PB_ADDDB" ;
+ Pos = MAP_APPFONT ( 118, 90 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
+ Text [ en-US ] = "Browse..." ;
+ };
+ FixedText FT_DESC
{
- Pos = MAP_APPFONT ( 12 , 110 ) ;
- Size = MAP_APPFONT ( 210 , 45 ) ;
+ Pos = MAP_APPFONT ( 12, 110 ) ;
+ Size = MAP_APPFONT ( 210, 45 ) ;
WordBreak = TRUE ;
Left = TRUE ;
- Text [ en-US ] = "Use this dialog to replace the databases you access in your document via database fields, with other databases. You can only make one change at a time. Multiple selection is possible in the list on the left.\nUse the browse button to select a database file." ;
+ Text [ en-US ] = "Use this dialog to replace the databases you access in your document via database fields, with other databases. You can only make one change at a time. Multiple selection is possible in the list on the left.\nUse the browse button to select a database file." ;
};
- FixedText FT_DOCDBTEXT
+ FixedText FT_DOCDBTEXT
{
- Pos = MAP_APPFONT ( 6 , 161 ) ;
- Size = MAP_APPFONT ( 100 , 8 ) ;
+ Pos = MAP_APPFONT ( 12, 161 ) ;
+ Size = MAP_APPFONT ( 100, 8 ) ;
Left = TRUE ;
Text [ en-US ] = "Database applied to document:" ;
};
FixedText FT_DOCDBNAME
{
- Pos = MAP_APPFONT ( 109 , 161 ) ;
- Size = MAP_APPFONT ( 114 , 8 ) ;
+ Pos = MAP_APPFONT ( 118, 161 ) ;
+ Size = MAP_APPFONT ( 114, 8 ) ;
Left = TRUE ;
Text [ en-US ] = "Addresses.Addresses" ;
};
OKButton BT_OK
{
- Pos = MAP_APPFONT ( 230 , 6 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
+ Pos = MAP_APPFONT ( 230, 6 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
TabStop = TRUE ;
DefButton = TRUE ;
Disable = TRUE ;
@@ -110,17 +110,17 @@ ModalDialog DLG_CHANGE_DB
};
CancelButton BT_CANCEL
{
- Pos = MAP_APPFONT ( 230 , 23 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
+ Pos = MAP_APPFONT ( 230, 23 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
TabStop = TRUE ;
Text [ en-US ] = "~Close" ;
};
HelpButton BT_HELP
{
- Pos = MAP_APPFONT ( 230 , 43 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
+ Pos = MAP_APPFONT ( 230, 43 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
TabStop = TRUE ;
};
};
-
+// ********************************************************************** EOF
[openoffice] 02/02: Add fixed line in dialog
Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit e9b3637dc0ef10af2c3f6cdf114e1ea7d8a8352f
Author: mseidel <ms...@apache.org>
AuthorDate: Tue Sep 27 23:17:05 2022 +0200
Add fixed line in dialog
(cherry picked from commit 24cebcdcd082893769c03848515688e48399d033)
---
main/sw/source/ui/fldui/changedb.cxx | 1 +
main/sw/source/ui/fldui/changedb.hrc | 37 ++++++++++++++++++------------------
main/sw/source/ui/fldui/changedb.src | 13 +++++++++----
main/sw/source/ui/inc/changedb.hxx | 32 ++++++++++++++++---------------
4 files changed, 45 insertions(+), 38 deletions(-)
diff --git a/main/sw/source/ui/fldui/changedb.cxx b/main/sw/source/ui/fldui/changedb.cxx
index 48eb663a8f..2eec82bc73 100644
--- a/main/sw/source/ui/fldui/changedb.cxx
+++ b/main/sw/source/ui/fldui/changedb.cxx
@@ -94,6 +94,7 @@ SwChangeDBDlg::SwChangeDBDlg(SwView& rVw) :
aOKBT (this, SW_RES(BT_OK )),
aCancelBT (this, SW_RES(BT_CANCEL )),
aHelpBT (this, SW_RES(BT_HELP )),
+ aApplDBFL (this, SW_RES(FL_APPLDB )),
// aChangeBT (this, SW_RES(BT_CHANGEDB )),
aImageList (SW_RES(ILIST_DB_DLG )),
aImageListHC (SW_RES(ILIST_DB_DLG_HC )),
diff --git a/main/sw/source/ui/fldui/changedb.hrc b/main/sw/source/ui/fldui/changedb.hrc
index 9f18cf5054..519ff20bd4 100644
--- a/main/sw/source/ui/fldui/changedb.hrc
+++ b/main/sw/source/ui/fldui/changedb.hrc
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -26,9 +26,9 @@
// #include -----------------------------------------------------------------
-// Elemente -----------------------------------------------------------------
+// Elements -----------------------------------------------------------------
-#define FT_DESC 1
+#define FT_DESC 1
#define FT_DOCDBTEXT 2
#define FT_DOCDBNAME 3
#define BT_CHANGEDB 4
@@ -36,23 +36,22 @@
#define FT_AVAILDB 6
#define TLB_USEDDB 7
#define TLB_AVAILDB 8
-#define FL_DBLIST 9
-#define BT_OK 10
-#define BT_CANCEL 11
-#define BT_HELP 12
-#define PB_ADDDB 13
+#define FL_DBLIST 9
+#define BT_OK 10
+#define BT_CANCEL 11
+#define BT_HELP 12
+#define PB_ADDDB 13
+#define FL_APPLDB 14
/*--------------------------------------------------------------------
- Beschreibung: Bitmaps
+ Description: Bitmaps
--------------------------------------------------------------------*/
-#define IMG_COLLAPSE 18002 /*RID_SVXIMG_COLLAPSEDNODE*/
-#define IMG_EXPAND 18003 /*RID_SVXIMG_EXPANDEDNODE*/
-#define IMG_DB 1
-#define IMG_DBTABLE 2
-#define IMG_DBQUERY 3
+#define IMG_COLLAPSE 18002 /*RID_SVXIMG_COLLAPSEDNODE*/
+#define IMG_EXPAND 18003 /*RID_SVXIMG_EXPANDEDNODE*/
+#define IMG_DB 1
+#define IMG_DBTABLE 2
+#define IMG_DBQUERY 3
#endif
-
-
diff --git a/main/sw/source/ui/fldui/changedb.src b/main/sw/source/ui/fldui/changedb.src
index 7bbe153546..a79d050c24 100644
--- a/main/sw/source/ui/fldui/changedb.src
+++ b/main/sw/source/ui/fldui/changedb.src
@@ -84,17 +84,22 @@ ModalDialog DLG_CHANGE_DB
Left = TRUE ;
Text [ en-US ] = "Use this dialog to replace the databases you access in your document via database fields, with other databases. You can only make one change at a time. Multiple selection is possible in the list on the left.\nUse the browse button to select a database file." ;
};
+ FixedLine FL_APPLDB
+ {
+ Pos = MAP_APPFONT ( 6, 154 ) ;
+ Size = MAP_APPFONT ( 274, 8 ) ;
+ };
FixedText FT_DOCDBTEXT
{
- Pos = MAP_APPFONT ( 12, 161 ) ;
- Size = MAP_APPFONT ( 100, 8 ) ;
+ Pos = MAP_APPFONT ( 6, 162 ) ;
+ Size = MAP_APPFONT ( 106, 8 ) ;
Left = TRUE ;
Text [ en-US ] = "Database applied to document:" ;
};
FixedText FT_DOCDBNAME
{
- Pos = MAP_APPFONT ( 118, 161 ) ;
- Size = MAP_APPFONT ( 114, 8 ) ;
+ Pos = MAP_APPFONT ( 118, 162 ) ;
+ Size = MAP_APPFONT ( 162, 8 ) ;
Left = TRUE ;
Text [ en-US ] = "Addresses.Addresses" ;
};
diff --git a/main/sw/source/ui/inc/changedb.hxx b/main/sw/source/ui/inc/changedb.hxx
index f9da3fd2db..2ef94076b8 100644
--- a/main/sw/source/ui/inc/changedb.hxx
+++ b/main/sw/source/ui/inc/changedb.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,19 +7,20 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
+
#ifndef _CHANGEDB_HXX
#define _CHANGEDB_HXX
@@ -45,36 +46,37 @@ class SwWrtShell;
struct SwDBData;
/*--------------------------------------------------------------------
- Beschreibung: Datenbank an Feldern austauschen
+ Description: Exchange database
--------------------------------------------------------------------*/
class SwChangeDBDlg: public SvxStandardDialog
{
- FixedLine aDBListFL;
+ FixedLine aDBListFL;
FixedText aUsedDBFT;
FixedText aAvailDBFT;
SvTreeListBox aUsedDBTLB;
SwDBTreeList aAvailDBTLB;
- PushButton aAddDBPB;
+ PushButton aAddDBPB;
FixedInfo aDescFT;
FixedText aDocDBTextFT;
FixedText aDocDBNameFT;
- OKButton aOKBT;
- CancelButton aCancelBT;
- HelpButton aHelpBT;
+ OKButton aOKBT;
+ CancelButton aCancelBT;
+ HelpButton aHelpBT;
+ FixedLine aApplDBFL;
// PushButton aChangeBT;
- ImageList aImageList;
- ImageList aImageListHC;
+ ImageList aImageList;
+ ImageList aImageListHC;
- SwWrtShell *pSh;
+ SwWrtShell *pSh;
SwFldMgr *pMgr;
DECL_LINK(TreeSelectHdl, SvTreeListBox* pBox = 0);
DECL_LINK(ButtonHdl, Button* pBtn);
- DECL_LINK(AddDBHdl, PushButton*);
+ DECL_LINK(AddDBHdl, PushButton*);
- virtual void Apply();
+ virtual void Apply();
void UpdateFlds();
void FillDBPopup();
SvLBoxEntry* Insert(const String& rDBName);