This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new d1a41c1600 Cleanup, fixed typos, removed whitespace
d1a41c1600 is described below
commit d1a41c160047ab711084886289642dca3445095b
Author: mseidel <[email protected]>
AuthorDate: Sat Aug 10 18:35:11 2024 +0200
Cleanup, fixed typos, removed whitespace
(cherry picked from commit 2d7380a4f0e02bcc9d64babe62a884a4a965608f)
---
.../deployment/gui/dp_gui_updateinstalldialog.src | 310 +++++++++------------
main/extensions/source/update/check/updatehdl.hrc | 110 ++++----
main/framework/source/services/backingwindow.cxx | 87 +++---
3 files changed, 233 insertions(+), 274 deletions(-)
diff --git a/main/desktop/source/deployment/gui/dp_gui_updateinstalldialog.src
b/main/desktop/source/deployment/gui/dp_gui_updateinstalldialog.src
index 6700021c0e..7d4d0c9d8f 100644
--- a/main/desktop/source/deployment/gui/dp_gui_updateinstalldialog.src
+++ b/main/desktop/source/deployment/gui/dp_gui_updateinstalldialog.src
@@ -1,200 +1,162 @@
/**************************************************************
- *
+ *
* 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
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
+ * "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.
- *
+ *
*************************************************************/
-
-
#include "svtools/controldims.hrc"
#include "dp_gui.hrc"
-
#define LOCAL_WIDTH (60 * RSC_BS_CHARWIDTH)
#define LOCAL_LIST_HEIGHT (7 * RSC_BS_CHARHEIGHT)
#define LOCAL_BUTTON_WIDTH 80
-ModalDialog RID_DLG_UPDATEINSTALL {
- HelpId = HID_DEPLOYMENT_GUI_UPDATEINSTALL;
- Size = MAP_APPFONT(
- (RSC_SP_DLG_INNERBORDER_LEFT + LOCAL_WIDTH +
- RSC_SP_DLG_INNERBORDER_RIGHT),
- (RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT +
- RSC_SP_CTRL_DESC_Y + RSC_CD_CHECKBOX_HEIGHT +
- RSC_SP_CTRL_DESC_Y + RSC_CD_FIXEDTEXT_HEIGHT +
- RSC_SP_CTRL_Y + RSC_CD_FIXEDTEXT_HEIGHT +
- RSC_SP_FLGR_SPACE_Y + LOCAL_LIST_HEIGHT +
- RSC_SP_FLGR_SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT +
- RSC_SP_FLGR_SPACE_Y + RSC_CD_PUSHBUTTON_HEIGHT +
- RSC_SP_DLG_INNERBORDER_BOTTOM));
- Text[en-US] = "Download and Installation";
- Moveable = TRUE;
- Closeable = TRUE;
- FixedText RID_DLG_UPDATE_INSTALL_DOWNLOADING {
- Pos = MAP_APPFONT(
- RSC_SP_DLG_INNERBORDER_LEFT, RSC_SP_DLG_INNERBORDER_TOP);
- Size = MAP_APPFONT(LOCAL_WIDTH, RSC_CD_FIXEDTEXT_HEIGHT);
- Text[en-US] = "Downloading extensions...";
- NoLabel = TRUE;
- };
-
- Window RID_DLG_UPDATE_INSTALL_STATUSBAR {
- Pos = MAP_APPFONT(
- RSC_SP_DLG_INNERBORDER_LEFT,
- (RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT +
- RSC_SP_CTRL_DESC_Y));
-
- Size = MAP_APPFONT(LOCAL_WIDTH, RSC_CD_CHECKBOX_HEIGHT);
- Border = TRUE;
- };
-
- FixedText RID_DLG_UPDATE_INSTALL_EXTENSION_NAME {
- Pos = MAP_APPFONT(
- RSC_SP_DLG_INNERBORDER_LEFT,
- RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT +
- RSC_SP_CTRL_DESC_Y + RSC_CD_CHECKBOX_HEIGHT +
RSC_SP_CTRL_DESC_Y);
- Size = MAP_APPFONT(LOCAL_WIDTH, RSC_CD_FIXEDTEXT_HEIGHT);
- Text[en-US] = "";
- NoLabel = TRUE;
- };
-
- FixedText RID_DLG_UPDATE_INSTALL_RESULTS {
- Pos = MAP_APPFONT(
- RSC_SP_DLG_INNERBORDER_LEFT,
- RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT +
- RSC_SP_CTRL_DESC_Y + RSC_CD_CHECKBOX_HEIGHT +
- RSC_SP_CTRL_DESC_Y + RSC_CD_FIXEDTEXT_HEIGHT +
- RSC_SP_CTRL_Y);
- Size = MAP_APPFONT(LOCAL_WIDTH, RSC_CD_FIXEDTEXT_HEIGHT);
- Text[en-US] = "Result";
- };
-
- MultiLineEdit RID_DLG_UPDATE_INSTALL_INFO {
- HelpID =
"desktop:MultiLineEdit:RID_DLG_UPDATEINSTALL:RID_DLG_UPDATE_INSTALL_INFO";
- Pos = MAP_APPFONT(
- RSC_SP_DLG_INNERBORDER_LEFT,
- RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT +
- RSC_SP_CTRL_DESC_Y + RSC_CD_CHECKBOX_HEIGHT +
- RSC_SP_CTRL_DESC_Y + RSC_CD_FIXEDTEXT_HEIGHT +
- RSC_SP_CTRL_Y + RSC_CD_FIXEDTEXT_HEIGHT +
- RSC_SP_CTRL_DESC_Y);
-
- Size = MAP_APPFONT(LOCAL_WIDTH, LOCAL_LIST_HEIGHT);
- Border = TRUE;
- ReadOnly = TRUE;
- VScroll = TRUE;
- TabStop = FALSE;
- };
-
- FixedLine RID_DLG_UPDATE_INSTALL_LINE {
- Pos = MAP_APPFONT(
- RSC_SP_DLG_INNERBORDER_LEFT,
- RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT +
- RSC_SP_CTRL_DESC_Y + RSC_CD_CHECKBOX_HEIGHT +
- RSC_SP_CTRL_DESC_Y + RSC_CD_FIXEDTEXT_HEIGHT +
- RSC_SP_CTRL_Y + RSC_CD_FIXEDTEXT_HEIGHT +
- RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT +
- RSC_SP_FLGR_SPACE_Y);
-
- Size = MAP_APPFONT(LOCAL_WIDTH, RSC_CD_FIXEDLINE_HEIGHT);
- };
-
- OKButton RID_DLG_UPDATE_INSTALL_OK {
- Disable = TRUE;
- Pos = MAP_APPFONT(
- RSC_SP_DLG_INNERBORDER_LEFT + LOCAL_WIDTH - LOCAL_BUTTON_WIDTH -
- RSC_SP_CTRL_GROUP_X - RSC_CD_PUSHBUTTON_WIDTH,
- RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT +
- RSC_SP_CTRL_DESC_Y + RSC_CD_CHECKBOX_HEIGHT +
- RSC_SP_CTRL_DESC_Y + RSC_CD_FIXEDTEXT_HEIGHT +
- RSC_SP_CTRL_Y + RSC_CD_FIXEDTEXT_HEIGHT +
- RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT +
- RSC_SP_FLGR_SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT +
- RSC_SP_FLGR_SPACE_Y);
-
-
- Size = MAP_APPFONT(RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT);
- Text[en-US] = "OK";
- };
-
- CancelButton RID_DLG_UPDATE_INSTALL_ABORT {
- Pos = MAP_APPFONT(
- RSC_SP_DLG_INNERBORDER_LEFT + LOCAL_WIDTH - LOCAL_BUTTON_WIDTH,
- RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT +
- RSC_SP_CTRL_DESC_Y + RSC_CD_CHECKBOX_HEIGHT +
- RSC_SP_CTRL_DESC_Y + RSC_CD_FIXEDTEXT_HEIGHT +
- RSC_SP_CTRL_Y + RSC_CD_FIXEDTEXT_HEIGHT +
- RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT +
- RSC_SP_FLGR_SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT +
- RSC_SP_FLGR_SPACE_Y);
-
- Size = MAP_APPFONT(LOCAL_BUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT);
- Text[en-US] = "Cancel Update";
- DefButton = TRUE;
- };
-
- HelpButton RID_DLG_UPDATE_INSTALL_HELP {
- Pos = MAP_APPFONT(
- RSC_SP_DLG_INNERBORDER_LEFT,
- RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT +
- RSC_SP_CTRL_DESC_Y + RSC_CD_CHECKBOX_HEIGHT +
- RSC_SP_CTRL_DESC_Y + RSC_CD_FIXEDTEXT_HEIGHT +
- RSC_SP_CTRL_Y + RSC_CD_FIXEDTEXT_HEIGHT +
- RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT +
- RSC_SP_FLGR_SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT +
- RSC_SP_FLGR_SPACE_Y);
- Size = MAP_APPFONT(RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT);
- };
-
-
- String RID_DLG_UPDATE_INSTALL_INSTALLING {
- Text[en-US] = "Installing extensions...";
- };
-
- String RID_DLG_UPDATE_INSTALL_FINISHED {
- Text[en-US] = "Installation finished";
- };
-
- String RID_DLG_UPDATE_INSTALL_NO_ERRORS {
- Text[en-US] = "No errors.";
- };
-
- String RID_DLG_UPDATE_INSTALL_ERROR_DOWNLOAD {
- Text[en-US] = "Error while downloading extension %NAME. ";
- };
-
- String RID_DLG_UPDATE_INSTALL_THIS_ERROR_OCCURRED {
- Text[en-US] = "The error message is: ";
- };
-
-
- String RID_DLG_UPDATE_INSTALL_ERROR_INSTALLATION {
- Text[en-US] = "Error while installing extension %NAME. ";
- };
-
- String RID_DLG_UPDATE_INSTALL_ERROR_LIC_DECLINED {
- Text[en-US] = "The license agreement for extension %NAME was refused.
";
- };
-
- String RID_DLG_UPDATE_INSTALL_EXTENSION_NOINSTALL{
- Text[en-US] = "The extension will not be installed.";
- };
-
+ModalDialog RID_DLG_UPDATEINSTALL
+{
+ HelpId = HID_DEPLOYMENT_GUI_UPDATEINSTALL ;
+ Size = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT + LOCAL_WIDTH +
RSC_SP_DLG_INNERBORDER_RIGHT,
+ RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT +
RSC_SP_CTRL_DESC_Y + RSC_CD_CHECKBOX_HEIGHT + RSC_SP_CTRL_DESC_Y +
RSC_CD_FIXEDTEXT_HEIGHT +
+ RSC_SP_CTRL_Y + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_FLGR_SPACE_Y +
LOCAL_LIST_HEIGHT + RSC_SP_FLGR_SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT +
RSC_SP_FLGR_SPACE_Y + RSC_CD_PUSHBUTTON_HEIGHT +
+ RSC_SP_DLG_INNERBORDER_BOTTOM ) ;
+ Text [ en-US ] = "Download and Installation" :
+ Moveable = TRUE ;
+ Closeable = TRUE ;
+ FixedText RID_DLG_UPDATE_INSTALL_DOWNLOADING
+ {
+ Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT,
RSC_SP_DLG_INNERBORDER_TOP ) ;
+ Size = MAP_APPFONT ( LOCAL_WIDTH, RSC_CD_FIXEDTEXT_HEIGHT ) ;
+ Text [ en-US ] = "Downloading extensions..." :
+ NoLabel = TRUE ;
+ };
+
+ Window RID_DLG_UPDATE_INSTALL_STATUSBAR
+ {
+ Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT,
RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y ) ;
+ Size = MAP_APPFONT ( LOCAL_WIDTH, RSC_CD_CHECKBOX_HEIGHT ) ;
+ Border = TRUE ;
+ };
+
+ FixedText RID_DLG_UPDATE_INSTALL_EXTENSION_NAME
+ {
+ Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT,
RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y +
RSC_CD_CHECKBOX_HEIGHT + RSC_SP_CTRL_DESC_Y ) ;
+ Size = MAP_APPFONT ( LOCAL_WIDTH, RSC_CD_FIXEDTEXT_HEIGHT ) ;
+ Text = "" :
+ NoLabel = TRUE ;
+ };
+
+ FixedText RID_DLG_UPDATE_INSTALL_RESULTS {
+ Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT,
RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT +
+ RSC_SP_CTRL_DESC_Y + RSC_CD_CHECKBOX_HEIGHT +
RSC_SP_CTRL_DESC_Y + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_Y ) ;
+ Size = MAP_APPFONT ( LOCAL_WIDTH, RSC_CD_FIXEDTEXT_HEIGHT ) ;
+ Text [ en-US ] = "Result" :
+ };
+
+ MultiLineEdit RID_DLG_UPDATE_INSTALL_INFO
+ {
+ HelpID =
"desktop:MultiLineEdit:RID_DLG_UPDATEINSTALL:RID_DLG_UPDATE_INSTALL_INFO" :
+ Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT,
RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT +
+ RSC_SP_CTRL_DESC_Y + RSC_CD_CHECKBOX_HEIGHT +
RSC_SP_CTRL_DESC_Y + RSC_CD_FIXEDTEXT_HEIGHT +
+ RSC_SP_CTRL_Y + RSC_CD_FIXEDTEXT_HEIGHT +
RSC_SP_CTRL_DESC_Y ) ;
+ Size = MAP_APPFONT ( LOCAL_WIDTH, LOCAL_LIST_HEIGHT ) ;
+ Border = TRUE ;
+ ReadOnly = TRUE ;
+ VScroll = TRUE ;
+ TabStop = FALSE ;
+ };
+
+ FixedLine RID_DLG_UPDATE_INSTALL_LINE
+ {
+ Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT,
RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT +
+ RSC_SP_CTRL_DESC_Y + RSC_CD_CHECKBOX_HEIGHT +
RSC_SP_CTRL_DESC_Y + RSC_CD_FIXEDTEXT_HEIGHT +
+ RSC_SP_CTRL_Y + RSC_CD_FIXEDTEXT_HEIGHT +
RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT + RSC_SP_FLGR_SPACE_Y ) ;
+ Size = MAP_APPFONT ( LOCAL_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ) ;
+ };
+
+ OKButton RID_DLG_UPDATE_INSTALL_OK
+ {
+ Disable = TRUE ;
+ Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT + LOCAL_WIDTH -
LOCAL_BUTTON_WIDTH - RSC_SP_CTRL_GROUP_X - RSC_CD_PUSHBUTTON_WIDTH,
+ RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT +
RSC_SP_CTRL_DESC_Y + RSC_CD_CHECKBOX_HEIGHT + RSC_SP_CTRL_DESC_Y +
RSC_CD_FIXEDTEXT_HEIGHT +
+ RSC_SP_CTRL_Y + RSC_CD_FIXEDTEXT_HEIGHT +
RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT + RSC_SP_FLGR_SPACE_Y +
RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_SPACE_Y ) ;
+ Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH,
RSC_CD_PUSHBUTTON_HEIGHT ) ;
+ Text [ en-US ] = "OK" :
+ };
+
+ CancelButton RID_DLG_UPDATE_INSTALL_ABORT
+ {
+ Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT + LOCAL_WIDTH -
LOCAL_BUTTON_WIDTH,
+ RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT +
RSC_SP_CTRL_DESC_Y + RSC_CD_CHECKBOX_HEIGHT + RSC_SP_CTRL_DESC_Y +
RSC_CD_FIXEDTEXT_HEIGHT +
+ RSC_SP_CTRL_Y + RSC_CD_FIXEDTEXT_HEIGHT +
RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT + RSC_SP_FLGR_SPACE_Y +
RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_SPACE_Y ) ;
+ Size = MAP_APPFONT ( LOCAL_BUTTON_WIDTH,
RSC_CD_PUSHBUTTON_HEIGHT ) ;
+ Text [ en-US ] = "Cancel Update" :
+ DefButton = TRUE ;
+ };
+
+ HelpButton RID_DLG_UPDATE_INSTALL_HELP
+ {
+ Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT,
+ RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT +
RSC_SP_CTRL_DESC_Y + RSC_CD_CHECKBOX_HEIGHT + RSC_SP_CTRL_DESC_Y +
RSC_CD_FIXEDTEXT_HEIGHT +
+ RSC_SP_CTRL_Y + RSC_CD_FIXEDTEXT_HEIGHT +
RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT + RSC_SP_FLGR_SPACE_Y +
RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_SPACE_Y ) ;
+ Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH,
RSC_CD_PUSHBUTTON_HEIGHT ) ;
+ };
+
+ String RID_DLG_UPDATE_INSTALL_INSTALLING
+ {
+ Text [ en-US ] = "Installing extensions..." :
+ };
+
+ String RID_DLG_UPDATE_INSTALL_FINISHED
+ {
+ Text [ en-US ] = "Installation finished" :
+ };
+
+ String RID_DLG_UPDATE_INSTALL_NO_ERRORS
+ {
+ Text [ en-US ] = "No errors." :
+ };
+
+ String RID_DLG_UPDATE_INSTALL_ERROR_DOWNLOAD
+ {
+ Text [ en-US ] = "Error while downloading extension %NAME. " :
+ };
+
+ String RID_DLG_UPDATE_INSTALL_THIS_ERROR_OCCURRED
+ {
+ Text [ en-US ] = "The error message is: " :
+ };
+
+
+ String RID_DLG_UPDATE_INSTALL_ERROR_INSTALLATION
+ {
+ Text [ en-US ] = "Error while installing extension %NAME. " :
+ };
+
+ String RID_DLG_UPDATE_INSTALL_ERROR_LIC_DECLINED
+ {
+ Text [ en-US ] = "The license agreement for extension %NAME was
refused. " :
+ };
+
+ String RID_DLG_UPDATE_INSTALL_EXTENSION_NOINSTALL
+ {
+ Text [ en-US ] = "The extension will not be installed." ;
+ };
+
};
+// ********************************************************************** EOF
diff --git a/main/extensions/source/update/check/updatehdl.hrc
b/main/extensions/source/update/check/updatehdl.hrc
index 5afcd64d1e..66afd358a4 100644
--- a/main/extensions/source/update/check/updatehdl.hrc
+++ b/main/extensions/source/update/check/updatehdl.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,73 +7,71 @@
* 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.
- *
+ *
*************************************************************/
-
-
- #define RID_UPDATE_HDL_START 1200
+ #define RID_UPDATE_HDL_START 1200
- #define RID_UPDATE_STR_CHECKING RID_UPDATE_HDL_START + 1
- #define RID_UPDATE_STR_NO_UPD_FOUND RID_UPDATE_HDL_START + 2
- #define RID_UPDATE_STR_UPD_FOUND RID_UPDATE_HDL_START + 3
- #define RID_UPDATE_STR_DLG_TITLE RID_UPDATE_HDL_START + 4
- #define RID_UPDATE_STR_DOWNLOAD_ERR RID_UPDATE_HDL_START + 5
- #define RID_UPDATE_STR_DOWNLOAD_WARN RID_UPDATE_HDL_START + 6
- #define RID_UPDATE_STR_DOWNLOADING RID_UPDATE_HDL_START + 7
- #define RID_UPDATE_STR_READY_INSTALL RID_UPDATE_HDL_START + 8
- #define RID_UPDATE_STR_CANCEL_TITLE RID_UPDATE_HDL_START + 9
- #define RID_UPDATE_STR_CANCEL_DOWNLOAD RID_UPDATE_HDL_START + 10
- #define RID_UPDATE_STR_BEGIN_INSTALL RID_UPDATE_HDL_START + 11
- #define RID_UPDATE_STR_INSTALL_NOW RID_UPDATE_HDL_START + 12
- #define RID_UPDATE_STR_INSTALL_LATER RID_UPDATE_HDL_START + 13
- #define RID_UPDATE_STR_CHECKING_ERR RID_UPDATE_HDL_START + 14
- #define RID_UPDATE_STR_OVERWRITE_WARNING RID_UPDATE_HDL_START + 15
- #define RID_UPDATE_STR_DOWNLOAD_PAUSE RID_UPDATE_HDL_START + 16
- #define RID_UPDATE_STR_DOWNLOAD_UNAVAIL RID_UPDATE_HDL_START + 17
- #define RID_UPDATE_STR_PERCENT RID_UPDATE_HDL_START + 18
- #define RID_UPDATE_STR_DOWNLOAD_DESCR RID_UPDATE_HDL_START + 19
- #define RID_UPDATE_STR_INSTALL_ERROR RID_UPDATE_HDL_START + 20
- #define RID_UPDATE_STR_RELOAD_WARNING RID_UPDATE_HDL_START + 21
- #define RID_UPDATE_STR_RELOAD_RELOAD RID_UPDATE_HDL_START + 22
- #define RID_UPDATE_STR_RELOAD_CONTINUE RID_UPDATE_HDL_START + 23
+ #define RID_UPDATE_STR_CHECKING RID_UPDATE_HDL_START +
1
+ #define RID_UPDATE_STR_NO_UPD_FOUND RID_UPDATE_HDL_START + 2
+ #define RID_UPDATE_STR_UPD_FOUND RID_UPDATE_HDL_START +
3
+ #define RID_UPDATE_STR_DLG_TITLE RID_UPDATE_HDL_START +
4
+ #define RID_UPDATE_STR_DOWNLOAD_ERR RID_UPDATE_HDL_START + 5
+ #define RID_UPDATE_STR_DOWNLOAD_WARN RID_UPDATE_HDL_START + 6
+ #define RID_UPDATE_STR_DOWNLOADING RID_UPDATE_HDL_START +
7
+ #define RID_UPDATE_STR_READY_INSTALL RID_UPDATE_HDL_START + 8
+ #define RID_UPDATE_STR_CANCEL_TITLE RID_UPDATE_HDL_START + 9
+ #define RID_UPDATE_STR_CANCEL_DOWNLOAD RID_UPDATE_HDL_START +
10
+ #define RID_UPDATE_STR_BEGIN_INSTALL RID_UPDATE_HDL_START + 11
+ #define RID_UPDATE_STR_INSTALL_NOW RID_UPDATE_HDL_START +
12
+ #define RID_UPDATE_STR_INSTALL_LATER RID_UPDATE_HDL_START + 13
+ #define RID_UPDATE_STR_CHECKING_ERR RID_UPDATE_HDL_START + 14
+ #define RID_UPDATE_STR_OVERWRITE_WARNING RID_UPDATE_HDL_START + 15
+ #define RID_UPDATE_STR_DOWNLOAD_PAUSE RID_UPDATE_HDL_START + 16
+ #define RID_UPDATE_STR_DOWNLOAD_UNAVAIL RID_UPDATE_HDL_START + 17
+ #define RID_UPDATE_STR_PERCENT
RID_UPDATE_HDL_START + 18
+ #define RID_UPDATE_STR_DOWNLOAD_DESCR RID_UPDATE_HDL_START + 19
+ #define RID_UPDATE_STR_INSTALL_ERROR RID_UPDATE_HDL_START + 20
+ #define RID_UPDATE_STR_RELOAD_WARNING RID_UPDATE_HDL_START + 21
+ #define RID_UPDATE_STR_RELOAD_RELOAD RID_UPDATE_HDL_START + 22
+ #define RID_UPDATE_STR_RELOAD_CONTINUE RID_UPDATE_HDL_START +
23
- #define RID_UPDATE_FT_DESCRIPTION RID_UPDATE_HDL_START + 25
- #define RID_UPDATE_FT_STATUS RID_UPDATE_HDL_START + 26
+ #define RID_UPDATE_FT_DESCRIPTION RID_UPDATE_HDL_START +
25
+ #define RID_UPDATE_FT_STATUS RID_UPDATE_HDL_START +
26
- #define RID_UPDATE_BTN_CLOSE RID_UPDATE_HDL_START + 30
- #define RID_UPDATE_BTN_DOWNLOAD RID_UPDATE_HDL_START + 31
- #define RID_UPDATE_BTN_INSTALL RID_UPDATE_HDL_START + 32
- #define RID_UPDATE_BTN_PAUSE RID_UPDATE_HDL_START + 33
- #define RID_UPDATE_BTN_RESUME RID_UPDATE_HDL_START + 34
- #define RID_UPDATE_BTN_CANCEL RID_UPDATE_HDL_START + 35
+ #define RID_UPDATE_BTN_CLOSE RID_UPDATE_HDL_START +
30
+ #define RID_UPDATE_BTN_DOWNLOAD RID_UPDATE_HDL_START +
31
+ #define RID_UPDATE_BTN_INSTALL
RID_UPDATE_HDL_START + 32
+ #define RID_UPDATE_BTN_PAUSE RID_UPDATE_HDL_START +
33
+ #define RID_UPDATE_BTN_RESUME RID_UPDATE_HDL_START +
34
+ #define RID_UPDATE_BTN_CANCEL RID_UPDATE_HDL_START +
35
- #define RID_UPDATE_BUBBLE_TEXT_START RID_UPDATE_HDL_START + 40
- #define RID_UPDATE_BUBBLE_UPDATE_AVAIL RID_UPDATE_BUBBLE_TEXT_START + 0
- #define RID_UPDATE_BUBBLE_UPDATE_NO_DOWN RID_UPDATE_BUBBLE_TEXT_START + 1
- #define RID_UPDATE_BUBBLE_AUTO_START RID_UPDATE_BUBBLE_TEXT_START + 2
- #define RID_UPDATE_BUBBLE_DOWNLOADING RID_UPDATE_BUBBLE_TEXT_START + 3
- #define RID_UPDATE_BUBBLE_DOWNLOAD_PAUSED RID_UPDATE_BUBBLE_TEXT_START + 4
- #define RID_UPDATE_BUBBLE_ERROR_DOWNLOADING RID_UPDATE_BUBBLE_TEXT_START +
5
- #define RID_UPDATE_BUBBLE_DOWNLOAD_AVAIL RID_UPDATE_BUBBLE_TEXT_START + 6
- #define RID_UPDATE_BUBBLE_EXT_UPD_AVAIL RID_UPDATE_BUBBLE_TEXT_START + 7
+ #define RID_UPDATE_BUBBLE_TEXT_START RID_UPDATE_HDL_START +
40
+ #define RID_UPDATE_BUBBLE_UPDATE_AVAIL
RID_UPDATE_BUBBLE_TEXT_START + 0
+ #define RID_UPDATE_BUBBLE_UPDATE_NO_DOWN
RID_UPDATE_BUBBLE_TEXT_START + 1
+ #define RID_UPDATE_BUBBLE_AUTO_START
RID_UPDATE_BUBBLE_TEXT_START + 2
+ #define RID_UPDATE_BUBBLE_DOWNLOADING
RID_UPDATE_BUBBLE_TEXT_START + 3
+ #define RID_UPDATE_BUBBLE_DOWNLOAD_PAUSED
RID_UPDATE_BUBBLE_TEXT_START + 4
+ #define RID_UPDATE_BUBBLE_ERROR_DOWNLOADING RID_UPDATE_BUBBLE_TEXT_START + 5
+ #define RID_UPDATE_BUBBLE_DOWNLOAD_AVAIL
RID_UPDATE_BUBBLE_TEXT_START + 6
+ #define RID_UPDATE_BUBBLE_EXT_UPD_AVAIL
RID_UPDATE_BUBBLE_TEXT_START + 7
- #define RID_UPDATE_BUBBLE_T_TEXT_START RID_UPDATE_HDL_START + 50
- #define RID_UPDATE_BUBBLE_T_UPDATE_AVAIL RID_UPDATE_BUBBLE_T_TEXT_START
+ 0
- #define RID_UPDATE_BUBBLE_T_UPDATE_NO_DOWN RID_UPDATE_BUBBLE_T_TEXT_START
+ 1
- #define RID_UPDATE_BUBBLE_T_AUTO_START RID_UPDATE_BUBBLE_T_TEXT_START
+ 2
- #define RID_UPDATE_BUBBLE_T_DOWNLOADING RID_UPDATE_BUBBLE_T_TEXT_START
+ 3
- #define RID_UPDATE_BUBBLE_T_DOWNLOAD_PAUSED RID_UPDATE_BUBBLE_T_TEXT_START
+ 4
- #define RID_UPDATE_BUBBLE_T_ERROR_DOWNLOADING RID_UPDATE_BUBBLE_T_TEXT_START
+ 5
- #define RID_UPDATE_BUBBLE_T_DOWNLOAD_AVAIL RID_UPDATE_BUBBLE_T_TEXT_START
+ 6
- #define RID_UPDATE_BUBBLE_T_EXT_UPD_AVAIL RID_UPDATE_BUBBLE_T_TEXT_START
+ 7
+ #define RID_UPDATE_BUBBLE_T_TEXT_START
RID_UPDATE_HDL_START + 50
+ #define RID_UPDATE_BUBBLE_T_UPDATE_AVAIL
RID_UPDATE_BUBBLE_T_TEXT_START + 0
+ #define RID_UPDATE_BUBBLE_T_UPDATE_NO_DOWN
RID_UPDATE_BUBBLE_T_TEXT_START + 1
+ #define RID_UPDATE_BUBBLE_T_AUTO_START
RID_UPDATE_BUBBLE_T_TEXT_START + 2
+ #define RID_UPDATE_BUBBLE_T_DOWNLOADING
RID_UPDATE_BUBBLE_T_TEXT_START + 3
+ #define RID_UPDATE_BUBBLE_T_DOWNLOAD_PAUSED RID_UPDATE_BUBBLE_T_TEXT_START
+ 4
+ #define RID_UPDATE_BUBBLE_T_ERROR_DOWNLOADING RID_UPDATE_BUBBLE_T_TEXT_START
+ 5
+ #define RID_UPDATE_BUBBLE_T_DOWNLOAD_AVAIL
RID_UPDATE_BUBBLE_T_TEXT_START + 6
+ #define RID_UPDATE_BUBBLE_T_EXT_UPD_AVAIL
RID_UPDATE_BUBBLE_T_TEXT_START + 7
diff --git a/main/framework/source/services/backingwindow.cxx
b/main/framework/source/services/backingwindow.cxx
index c95161fef0..7a02cf1892 100644
--- a/main/framework/source/services/backingwindow.cxx
+++ b/main/framework/source/services/backingwindow.cxx
@@ -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,20 +7,18 @@
* 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.
- *
+ *
*************************************************************/
-
-
// autogen include statement, do not remove
#include "precompiled_framework.hxx"
@@ -88,32 +86,32 @@ DecoToolBox::DecoToolBox( Window* pParent, WinBits nStyle )
:
void DecoToolBox::DataChanged( const DataChangedEvent& rDCEvt )
{
- Window::DataChanged( rDCEvt );
-
- if ( rDCEvt.GetFlags() & SETTINGS_STYLE )
- {
- calcMinSize();
- SetBackground();
- SetPaintTransparent( sal_True );
- }
+ Window::DataChanged( rDCEvt );
+
+ if ( rDCEvt.GetFlags() & SETTINGS_STYLE )
+ {
+ calcMinSize();
+ SetBackground();
+ SetPaintTransparent( sal_True );
+ }
}
void DecoToolBox::calcMinSize()
{
- ToolBox aTbx( GetParent() );
- sal_uInt16 nItems = GetItemCount();
- for( sal_uInt16 i = 0; i < nItems; i++ )
- {
- sal_uInt16 nId = GetItemId( i );
- aTbx.InsertItem( nId, GetItemImage( nId ) );
- }
- aTbx.SetOutStyle( TOOLBOX_STYLE_FLAT );
- maMinSize = aTbx.CalcWindowSizePixel();
+ ToolBox aTbx( GetParent() );
+ sal_uInt16 nItems = GetItemCount();
+ for( sal_uInt16 i = 0; i < nItems; i++ )
+ {
+ sal_uInt16 nId = GetItemId( i );
+ aTbx.InsertItem( nId, GetItemImage( nId ) );
+ }
+ aTbx.SetOutStyle( TOOLBOX_STYLE_FLAT );
+ maMinSize = aTbx.CalcWindowSizePixel();
}
Size DecoToolBox::getMinSize()
{
- return maMinSize;
+ return maMinSize;
}
class RecentFilesStringLength : public ::cppu::WeakImplHelper1<
::com::sun::star::util::XStringWidth >
@@ -186,7 +184,7 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
mxPopupMenuFactory.set(
frame::PopupMenuControllerFactory::create( mxContext ) );
- // TODO If there is no PopupMenuController, the button should be a
nomral one not a MenuButton
+ // TODO If there is no PopupMenuController, the button should be a
normal one not a MenuButton
if ( mxPopupMenuFactory->hasController(
DECLARE_ASCII( RECENT_FILE_LIST ) , SERVICENAME_STARTMODULE ) )
{
@@ -258,7 +256,7 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
// add some breathing space for the images
maButtonImageSize.Width() += 12;
maButtonImageSize.Height() += 12;
-
+
}
@@ -358,9 +356,9 @@ void BackingWindow::initBackground()
maWelcomeTextColor = maLabelTextColor = Color( COL_WHITE );
else if( mnLayoutStyle == 1 )
maWelcomeTextColor = maLabelTextColor = Color( COL_BLACK );
- else
+ else
maWelcomeTextColor = maLabelTextColor = Color( 0x26, 0x35, 0x42 );
-
+
Color aTextBGColor( bDark ? COL_BLACK : COL_WHITE );
// select image set
@@ -414,7 +412,7 @@ void BackingWindow::initBackground()
loadImage( FwkResId( BMP_BACKING_FORMULA ), maMathButton );
loadImage( FwkResId( BMP_BACKING_OPENFILE ), maOpenButton );
loadImage( FwkResId( BMP_BACKING_OPENTEMPLATE ), maTemplateButton );
-
+
maOpenButton.SetMenuMode( MENUBUTTON_MENUMODE_TIMED );
maOpenButton.SetActivateHdl( LINK( this, BackingWindow, ActivateHdl ) );
}
@@ -476,7 +474,7 @@ void BackingWindow::initControls()
if( mnLayoutStyle == 1 )
{
- maWelcome.Show();
+ maWelcome.Show();
maProduct.Show();
}
@@ -547,19 +545,19 @@ void BackingWindow::initControls()
maMathButton, aMnemns );
nYPos += 3*maButtonImageSize.Height() / 2;
-
+
layoutButton( NULL, 0, aFileNewAppsAvailable,
aModuleOptions, SvtModuleOptions::E_SWRITER,
maOpenButton, aMnemns, maOpenString );
layoutButton( NULL, 1, aFileNewAppsAvailable,
aModuleOptions, SvtModuleOptions::E_SWRITER,
- maTemplateButton, aMnemns, maTemplateString );
+ maTemplateButton, aMnemns, maTemplateString );
nYPos += 10;
DBG_ASSERT( nYPos < maControlRect.GetHeight(), "misformatting !" );
if( mnColumnWidth[0] + mnColumnWidth[1] + mnBtnPos + 20 >
maControlRect.GetWidth() )
maControlRect.Right() = maControlRect.Left() + mnColumnWidth[0] +
mnColumnWidth[1] + mnBtnPos + 20;
-
+
mnTextColumnWidth[0] = mnColumnWidth[0];
mnTextColumnWidth[1] = mnColumnWidth[1];
@@ -601,7 +599,7 @@ void BackingWindow::initControls()
maBackgroundMiddle = BitmapEx();
Resize();
-
+
maWriterButton.GrabFocus();
}
@@ -640,7 +638,7 @@ void BackingWindow::layoutButton(
String aText( i_rStr.Len() ? i_rStr :
SvFileInformationManager::GetDescription( INetURLObject( aURL ) ) );
i_rMnemns.CreateMnemonic( aText );
i_rBtn.SetText( aText );
-
+
long nTextWidth = i_rBtn.GetTextWidth( i_rBtn.GetText() );
nTextWidth += maButtonImageSize.Width() + 8; // add some fuzz to be on the
safe side
@@ -658,7 +656,7 @@ void BackingWindow::layoutButton(
void BackingWindow::Paint( const Rectangle& )
{
Resize();
-
+
Wallpaper aBack( GetSettings().GetStyleSettings().GetWorkspaceGradient() );
Region aClip( Rectangle( Point( 0, 0 ), GetOutputSizePixel() ) );
Rectangle aBmpRect(maControlRect);
@@ -671,7 +669,7 @@ void BackingWindow::Paint( const Rectangle& )
IntersectClipRegion( aClip );
DrawWallpaper( Rectangle( Point( 0, 0 ), GetOutputSizePixel() ), aBack );
Pop();
-
+
VirtualDevice aDev( *this );
aDev.EnableRTL( IsRTLEnabled() );
aDev.SetOutputSizePixel( aBmpRect.GetSize() );
@@ -688,7 +686,7 @@ void BackingWindow::Paint( const Rectangle& )
aTL.X() += maBackgroundMiddle.GetSizePixel().Width();
}
aDev.DrawBitmapEx( aTL, maBackgroundRight );
-
+
DrawOutDev( aBmpRect.TopLeft(), aBmpRect.GetSize(),
Point( 0, 0 ), aBmpRect.GetSize(),
aDev );
@@ -768,7 +766,7 @@ long BackingWindow::Notify( NotifyEvent& rNEvt )
else if( maDBButton.HasFocus() )
maMathButton.GrabFocus();
else if( maMathButton.HasFocus() )
- maTemplateButton.GrabFocus();
+ maTemplateButton.GrabFocus();
return 1;
}
}
@@ -830,7 +828,7 @@ void BackingWindow::Resize()
nYPos += nPDelta - nDiff;
nYPos += nWDelta/2 - nDiff;
-
+
if( mnLayoutStyle != 1 )
nYPos = maControlRect.Top() + mnBtnTop;
@@ -894,7 +892,7 @@ IMPL_LINK( BackingWindow, ToolboxHdl, void*, EMPTYARG )
//throws css::container::NoSuchElementException,
css::lang::WrappedTargetException
Any value(
xNameAccess->getByName(rtl::OUString::createFromAscii(pNode)) );
sURL = value.get<rtl::OUString> ();
-
+
// extend the URLs with Office locale argument
INetURLObject aURLObj( sURL );
@@ -909,7 +907,7 @@ IMPL_LINK( BackingWindow, ToolboxHdl, void*, EMPTYARG )
::rtl::OUString sPackage =
::rtl::OUString::createFromAscii("org.openoffice.Setup");
::rtl::OUString sRelPath =
::rtl::OUString::createFromAscii("L10N");
::rtl::OUString sKey =
::rtl::OUString::createFromAscii("ooLocale");
-
+
try
{
::comphelper::ConfigurationHelper::readDirectKey(comphelper::getProcessServiceFactory(),
@@ -926,7 +924,7 @@ IMPL_LINK( BackingWindow, ToolboxHdl, void*, EMPTYARG )
aURLBuf.append(sLocale);
sParam = aURLBuf.makeStringAndClear();
-
+
aURLObj.SetParam( sParam );
sURL = aURLObj.GetMainURL( INetURLObject::NO_DECODE );
@@ -1073,6 +1071,7 @@ void BackingWindow::dispatchURL( const rtl::OUString&
i_rURL,
catch ( com::sun::star::uno::Exception& )
{
}
- }
+ }
}
+/* vim: set noet sw=4 ts=4: */
