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 a22b373ecf Maintenance cleanup
a22b373ecf is described below
commit a22b373ecfd94a96960f079d94f4f2224cf97178
Author: mseidel <msei...@apache.org>
AuthorDate: Thu Jun 6 16:32:42 2024 +0200
Maintenance cleanup
(cherry picked from commit 6f71c8ba79c522bf18f1ed1034c8f4aa9dab228d)
---
main/sw/source/ui/utlui/gloslst.src | 68 ++++++++-------------------
main/sw/source/ui/utlui/unotools.src | 89 ++++++++++++------------------------
main/sw/source/ui/utlui/utlui.src | 57 +++++++++++------------
main/sw/source/ui/utlui/zoomctrl.cxx | 22 ++++-----
4 files changed, 80 insertions(+), 156 deletions(-)
diff --git a/main/sw/source/ui/utlui/gloslst.src
b/main/sw/source/ui/utlui/gloslst.src
index ca3f4741d8..16602e2c6b 100644
--- a/main/sw/source/ui/utlui/gloslst.src
+++ b/main/sw/source/ui/utlui/gloslst.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,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.
- *
+ *
*************************************************************/
-
-
#include "globals.hrc"
#include "utlui.hrc"
#include "helpid.h"
@@ -31,75 +29,45 @@ ModalDialog DLG_GLOSSARY_DECIDE_DLG
HelpID = HID_DLG_GLOSS_DECIDE ;
OutputSize = TRUE ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 161 , 67 ) ;
+ Size = MAP_APPFONT ( 161, 67 ) ;
Text [ en-US ] = "Select AutoText:" ;
Moveable = TRUE ;
- FixedLine FL_GLOSS
+ FixedLine FL_GLOSS
{
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 93 , 8 ) ;
+ Pos = MAP_APPFONT ( 6, 3 ) ;
+ Size = MAP_APPFONT ( 93, 8 ) ;
Text [ en-US ] = "AutoText - Group" ;
};
OKButton PB_OK
{
- Pos = MAP_APPFONT ( 105 , 6 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
+ Pos = MAP_APPFONT ( 105, 6 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
TabStop = TRUE ;
Group = TRUE ;
DefButton = TRUE ;
};
CancelButton PB_CANCEL
{
- Pos = MAP_APPFONT ( 105 , 23 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
+ Pos = MAP_APPFONT ( 105, 23 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
TabStop = TRUE ;
Group = TRUE ;
};
HelpButton PB_HELP
{
- Pos = MAP_APPFONT ( 105 , 43 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
+ Pos = MAP_APPFONT ( 105, 43 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
TabStop = TRUE ;
Group = TRUE ;
};
ListBox LB_LIST
{
- HelpID = "sw:ListBox:DLG_GLOSSARY_DECIDE_DLG:LB_LIST";
- Pos = MAP_APPFONT ( 12 , 15 ) ;
- Size = MAP_APPFONT ( 81 , 40 ) ;
+ HelpID = "sw:ListBox:DLG_GLOSSARY_DECIDE_DLG:LB_LIST" ;
+ Pos = MAP_APPFONT ( 12, 15 ) ;
+ Size = MAP_APPFONT ( 81, 40 ) ;
TabStop = TRUE ;
Border = TRUE ;
};
};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+// ********************************************************************** EOF
diff --git a/main/sw/source/ui/utlui/unotools.src
b/main/sw/source/ui/utlui/unotools.src
index 79e5af667b..37396e4e1b 100644
--- a/main/sw/source/ui/utlui/unotools.src
+++ b/main/sw/source/ui/utlui/unotools.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,19 +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.
- *
+ *
*************************************************************/
-
#include <unotools.hrc>
#include <utlui.hrc>
#include <globals.hrc>
@@ -30,54 +29,54 @@ ModalDialog DLG_RENAME_XNAMED
HelpID = HID_RENAME_XNAMED ;
OutputSize = TRUE ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 220 , 60 ) ;
+ Size = MAP_APPFONT ( 220, 60 ) ;
Moveable = TRUE ;
FixedText FT_NEW_NAME
{
- Pos = MAP_APPFONT ( 12 , 15 ) ;
- Size = MAP_APPFONT ( 50 , 10 ) ;
- Text [ en-US ] = "New name";
+ Pos = MAP_APPFONT ( 12, 15 ) ;
+ Size = MAP_APPFONT ( 50, 10 ) ;
+ Text [ en-US ] = "New name" ;
};
Edit ED_NEW_NAME
{
- HelpID = "sw:Edit:DLG_RENAME_XNAMED:ED_NEW_NAME";
- Pos = MAP_APPFONT ( 65 , 13 ) ;
- Size = MAP_APPFONT ( 87 , 12 ) ;
- Border = TRUE;
+ HelpID = "sw:Edit:DLG_RENAME_XNAMED:ED_NEW_NAME" ;
+ Pos = MAP_APPFONT ( 65, 13 ) ;
+ Size = MAP_APPFONT ( 87, 12 ) ;
+ Border = TRUE ;
};
- FixedLine FL_NAME
+ FixedLine FL_NAME
{
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 152 , 8 ) ;
- Text [ en-US ] = "Change name";
+ Pos = MAP_APPFONT ( 6, 3 ) ;
+ Size = MAP_APPFONT ( 152, 8 ) ;
+ Text [ en-US ] = "Change name" ;
};
OKButton PB_OK
{
- Pos = MAP_APPFONT ( 164 , 6 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
+ Pos = MAP_APPFONT ( 164, 6 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
TabStop = TRUE ;
Group = TRUE ;
DefButton = TRUE ;
};
CancelButton PB_CANCEL
{
- Pos = MAP_APPFONT ( 164 , 23 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
+ Pos = MAP_APPFONT ( 164, 23 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
TabStop = TRUE ;
Group = TRUE ;
};
HelpButton PB_HELP
{
- Pos = MAP_APPFONT ( 164 , 43 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
+ Pos = MAP_APPFONT ( 164, 43 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
TabStop = TRUE ;
Group = TRUE ;
};
- Text [ en-US ] = "Rename object: ";
+ Text [ en-US ] = "Rename object: " ;
};
String STR_SERVICE_UNAVAILABLE
{
- Text [ en-US ] = "The following service is not available: ";
+ Text [ en-US ] = "The following service is not available: " ;
};
Resource RES_FRMEX_MENU
{
@@ -85,43 +84,11 @@ Resource RES_FRMEX_MENU
{
ItemList [ en-US ] =
{
- < "~Zoom" ; ST_MENU_ZOOM; > ;
- < "~Upwards" ; ST_MENU_UP; > ;
- < "Do~wnwards" ; ST_MENU_DOWN; > ;
+ < "~Zoom" ; ST_MENU_ZOOM; > ;
+ < "~Upwards" ; ST_MENU_UP; > ;
+ < "Do~wnwards" ; ST_MENU_DOWN; > ;
};
};
};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+// ********************************************************************** EOF
diff --git a/main/sw/source/ui/utlui/utlui.src
b/main/sw/source/ui/utlui/utlui.src
index e81ec43c6b..d7c751a25c 100644
--- a/main/sw/source/ui/utlui/utlui.src
+++ b/main/sw/source/ui/utlui/utlui.src
@@ -19,14 +19,11 @@
*
*************************************************************/
-
-
#include "globals.hrc"
#include "utlui.hrc"
#include "helpid.h"
#include "comcore.hrc"
-
Resource RID_SHELLRES_AUTOFMTSTRS
{
String STR_AUTOFMTREDL_DEL_EMPTY_PARA+1
@@ -119,7 +116,6 @@ Resource RID_SHELLRES_AUTOFMTSTRS
{
Text [ en-US ] = "Add non breaking space" ;
};
-
};
/*---------------------------------------------------------------------
@@ -395,47 +391,47 @@ Image IMG_VIEWLAYOUT_SINGLECOLUMN
};
Image IMG_VIEWLAYOUT_SINGLECOLUMN_ACTIVE
{
- ImageBitmap = Bitmap
- {
- File = "emptypage_a_11x15.png" ;
- };
+ ImageBitmap = Bitmap
+ {
+ File = "emptypage_a_11x15.png" ;
+ };
};
Image IMG_VIEWLAYOUT_AUTOMATIC_HC
{
- ImageBitmap = Bitmap
- {
- File = "twopages_11x25_h.png" ;
- };
+ ImageBitmap = Bitmap
+ {
+ File = "twopages_11x25_h.png" ;
+ };
};
Image IMG_VIEWLAYOUT_AUTOMATIC_ACTIVE_HC
{
- ImageBitmap = Bitmap
- {
- File = "twopages_a_11x25_h.png" ;
- };
+ ImageBitmap = Bitmap
+ {
+ File = "twopages_a_11x25_h.png" ;
+ };
};
Image IMG_VIEWLAYOUT_BOOKMODE_HC
{
- ImageBitmap = Bitmap
- {
- File = "doublepage_11x23_h.png" ;
- };
+ ImageBitmap = Bitmap
+ {
+ File = "doublepage_11x23_h.png" ;
+ };
};
Image IMG_VIEWLAYOUT_BOOKMODE_ACTIVE_HC
{
- ImageBitmap = Bitmap
- {
- File = "doublepage_a_11x23_h.png" ;
- };
+ ImageBitmap = Bitmap
+ {
+ File = "doublepage_a_11x23_h.png" ;
+ };
};
Image IMG_VIEWLAYOUT_SINGLECOLUMN_HC
{
- ImageBitmap = Bitmap
- {
- File = "emptypage_11x15_h.png" ;
- };
+ ImageBitmap = Bitmap
+ {
+ File = "emptypage_11x15_h.png" ;
+ };
};
Image IMG_VIEWLAYOUT_SINGLECOLUMN_ACTIVE_HC
{
@@ -446,14 +442,13 @@ Image IMG_VIEWLAYOUT_SINGLECOLUMN_ACTIVE_HC
};
-
String STR_HYPERCTRL_SEL
{
- Text [ en-US ] = "SEL";
+ Text [ en-US ] = "SEL" ;
};
String STR_HYPERCTRL_HYP
{
- Text [ en-US ] = "HYP";
+ Text [ en-US ] = "HYP" ;
};
// ********************************************************************** EOF
diff --git a/main/sw/source/ui/utlui/zoomctrl.cxx
b/main/sw/source/ui/utlui/zoomctrl.cxx
index 512ec2de6c..1f0a59c91c 100644
--- a/main/sw/source/ui/utlui/zoomctrl.cxx
+++ b/main/sw/source/ui/utlui/zoomctrl.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,25 +7,21 @@
* 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.
- *
+ *
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-
-
#include "hintids.hxx"
#ifndef _STATUS_HXX //autogen
@@ -43,9 +39,9 @@ SFX_IMPL_STATUSBAR_CONTROL( SwZoomControl, SvxZoomItem );
SwZoomControl::SwZoomControl( sal_uInt16 _nSlotId,
- sal_uInt16 _nId,
- StatusBar& rStb ) :
- SvxZoomStatusBarControl( _nSlotId, _nId, rStb )
+ sal_uInt16 _nId,
+ StatusBar& rStb ) :
+ SvxZoomStatusBarControl( _nSlotId, _nId, rStb )
{
}
@@ -90,6 +86,4 @@ void SwZoomControl::Command( const CommandEvent& rCEvt )
SvxZoomStatusBarControl::Command(rCEvt);
}
-
-
-
+/* vim: set noet sw=4 ts=4: */
