[openoffice] branch AOO42X updated: Cleaned up resource file
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 a455b7f44a Cleaned up resource file
a455b7f44a is described below
commit a455b7f44a40a4a71c04c4cddab283286df97506
Author: mseidel
AuthorDate: Sat Sep 17 17:38:23 2022 +0200
Cleaned up resource file
(cherry picked from commit a5eec534055ac9435019123c230f0b97484dd922)
---
.../source/ext/macromigration/macromigration.src | 560 +++--
1 file changed, 281 insertions(+), 279 deletions(-)
diff --git a/main/dbaccess/source/ext/macromigration/macromigration.src
b/main/dbaccess/source/ext/macromigration/macromigration.src
index e3167fc933..cabb279858 100644
--- a/main/dbaccess/source/ext/macromigration/macromigration.src
+++ b/main/dbaccess/source/ext/macromigration/macromigration.src
@@ -1,22 +1,22 @@
/**
- *
+ *
* 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.
- *
+ *
*/
@@ -27,33 +27,33 @@
//
-
ModalDialog DLG_MACRO_MIGRATION
{
-HelpID = "dbaccess:ModalDialog:DLG_MACRO_MIGRATION";
+ HelpID = "dbaccess:ModalDialog:DLG_MACRO_MIGRATION" ;
OutputSize = TRUE ;
- Moveable = TRUE;
+ Moveable = TRUE ;
Closeable = TRUE ;
- Hide = TRUE;
+ Hide = TRUE ;
-Text[ en-US ] = "Database Document Macro Migration" ;
+ Text [ en-US ] = "Database Document Macro Migration" ;
-String STR_STATE_CLOSE_SUB_DOCS
-{
-Text [ en-US ] = "Prepare";
-};
+ String STR_STATE_CLOSE_SUB_DOCS
+ {
+ Text [ en-US ] = "Prepare" ;
+ };
-String STR_STATE_BACKUP_DBDOC
-{
-Text [ en-US ] = "Backup Document";
-};
+ String STR_STATE_BACKUP_DBDOC
+ {
+ Text [ en-US ] = "Backup Document" ;
+ };
-String STR_STATE_MIGRATE
-{
-Text [ en-US ] = "Migrate";
-};
+ String STR_STATE_MIGRATE
+ {
+ Text [ en-US ] = "Migrate" ;
+ };
-String STR_STATE_SUMMARY
-{
-Text [ en-US ] = "Summary";
-};
+ String STR_STATE_SUMMARY
+ {
+ Text [ en-US ] = "Summary" ;
+ };
};
//
@@ -62,39 +62,39 @@ ModalDialog DLG_MACRO_MIGRATION
TabPage TP_PREPARE
{
-HelpID = "dbaccess:TabPage:TP_PREPARE";
-Pos = MAP_APPFONT( 40, 130 );
-Size = MAP_APPFONT( TAB_PAGE_WIDTH, TAB_PAGE_HEIGHT );
-
-Hide = TRUE;
-
-FixedText FT_HEADER
-{
-Pos = MAP_APPFONT( TAB_PAGE_CONTENT_MARGIN, TAB_PAGE_CONTENT_MARGIN );
-Size = MAP_APPFONT( TAB_PAGE_WIDTH - 2 * TAB_PAGE_CONTENT_MARGIN,
FIXED_TEXT_HEIGHT );
-
-Text [ en-US ] = "Welcome to the Database Macro Migration Wizard";
-};
-
-FixedText FT_INTRODUCTION
-{
-Pos = MAP_APPFONT( TAB_PAGE_CONTENT_MARGIN, CONTENT_POS_X );
-Size = MAP_APPFONT( TAB_PAGE_WIDTH - 2 * TAB_PAGE_CONTENT_MARGIN,
-TAB_PAGE_HEIGHT - CONTENT_POS_X -
TAB_PAGE_CONTENT_MARGIN - ( 2 * FIXED_TEXT_HEIGHT - SPACING_UNRELATED ) );
-WordBreak = TRUE;
-
-Text [ en-US ] = "This wizard will guide you through the task of
migrating your macros.\n\nAfter you finished it, all macros which were formerly
embedded into the forms and reports of the current database document will have
been moved to the document itself. In this course, libraries will be renamed as
needed.\n\nIf your forms and reports contain references to those macros, they
will be adjusted, where possible.\n\nBefore the migration can start, all forms,
reports, queries and t [...]
-};
-
-FixedText FT_CLOSE_DOC_ERROR
-{
-Pos = MAP_APPFONT ( TAB_PAGE_CONTENT_MARGIN,
-TAB_PAGE_HEIGHT - TAB_PAGE_CONTENT_MARGIN - (
[openoffice] branch trunk updated: Cleaned up resource file
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new a5eec53405 Cleaned up resource file
a5eec53405 is described below
commit a5eec534055ac9435019123c230f0b97484dd922
Author: mseidel
AuthorDate: Sat Sep 17 17:38:23 2022 +0200
Cleaned up resource file
---
.../source/ext/macromigration/macromigration.src | 560 +++--
1 file changed, 281 insertions(+), 279 deletions(-)
diff --git a/main/dbaccess/source/ext/macromigration/macromigration.src
b/main/dbaccess/source/ext/macromigration/macromigration.src
index e3167fc933..cabb279858 100644
--- a/main/dbaccess/source/ext/macromigration/macromigration.src
+++ b/main/dbaccess/source/ext/macromigration/macromigration.src
@@ -1,22 +1,22 @@
/**
- *
+ *
* 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.
- *
+ *
*/
@@ -27,33 +27,33 @@
//
-
ModalDialog DLG_MACRO_MIGRATION
{
-HelpID = "dbaccess:ModalDialog:DLG_MACRO_MIGRATION";
+ HelpID = "dbaccess:ModalDialog:DLG_MACRO_MIGRATION" ;
OutputSize = TRUE ;
- Moveable = TRUE;
+ Moveable = TRUE ;
Closeable = TRUE ;
- Hide = TRUE;
+ Hide = TRUE ;
-Text[ en-US ] = "Database Document Macro Migration" ;
+ Text [ en-US ] = "Database Document Macro Migration" ;
-String STR_STATE_CLOSE_SUB_DOCS
-{
-Text [ en-US ] = "Prepare";
-};
+ String STR_STATE_CLOSE_SUB_DOCS
+ {
+ Text [ en-US ] = "Prepare" ;
+ };
-String STR_STATE_BACKUP_DBDOC
-{
-Text [ en-US ] = "Backup Document";
-};
+ String STR_STATE_BACKUP_DBDOC
+ {
+ Text [ en-US ] = "Backup Document" ;
+ };
-String STR_STATE_MIGRATE
-{
-Text [ en-US ] = "Migrate";
-};
+ String STR_STATE_MIGRATE
+ {
+ Text [ en-US ] = "Migrate" ;
+ };
-String STR_STATE_SUMMARY
-{
-Text [ en-US ] = "Summary";
-};
+ String STR_STATE_SUMMARY
+ {
+ Text [ en-US ] = "Summary" ;
+ };
};
//
@@ -62,39 +62,39 @@ ModalDialog DLG_MACRO_MIGRATION
TabPage TP_PREPARE
{
-HelpID = "dbaccess:TabPage:TP_PREPARE";
-Pos = MAP_APPFONT( 40, 130 );
-Size = MAP_APPFONT( TAB_PAGE_WIDTH, TAB_PAGE_HEIGHT );
-
-Hide = TRUE;
-
-FixedText FT_HEADER
-{
-Pos = MAP_APPFONT( TAB_PAGE_CONTENT_MARGIN, TAB_PAGE_CONTENT_MARGIN );
-Size = MAP_APPFONT( TAB_PAGE_WIDTH - 2 * TAB_PAGE_CONTENT_MARGIN,
FIXED_TEXT_HEIGHT );
-
-Text [ en-US ] = "Welcome to the Database Macro Migration Wizard";
-};
-
-FixedText FT_INTRODUCTION
-{
-Pos = MAP_APPFONT( TAB_PAGE_CONTENT_MARGIN, CONTENT_POS_X );
-Size = MAP_APPFONT( TAB_PAGE_WIDTH - 2 * TAB_PAGE_CONTENT_MARGIN,
-TAB_PAGE_HEIGHT - CONTENT_POS_X -
TAB_PAGE_CONTENT_MARGIN - ( 2 * FIXED_TEXT_HEIGHT - SPACING_UNRELATED ) );
-WordBreak = TRUE;
-
-Text [ en-US ] = "This wizard will guide you through the task of
migrating your macros.\n\nAfter you finished it, all macros which were formerly
embedded into the forms and reports of the current database document will have
been moved to the document itself. In this course, libraries will be renamed as
needed.\n\nIf your forms and reports contain references to those macros, they
will be adjusted, where possible.\n\nBefore the migration can start, all forms,
reports, queries and t [...]
-};
-
-FixedText FT_CLOSE_DOC_ERROR
-{
-Pos = MAP_APPFONT ( TAB_PAGE_CONTENT_MARGIN,
-TAB_PAGE_HEIGHT - TAB_PAGE_CONTENT_MARGIN - ( 2 *
FIXED_TEXT_HEIGHT - SPACING_UNRELATED ) );
-Size = MAP_APPFONT(
[openoffice] branch AOO42X updated: Fixed typos, removed whitespace
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 57a904c9d2 Fixed typos, removed whitespace
57a904c9d2 is described below
commit 57a904c9d2d7a282aa411e5e14633a27b80300b3
Author: mseidel
AuthorDate: Sat Sep 17 15:46:45 2022 +0200
Fixed typos, removed whitespace
(cherry picked from commit 6e496631967b81de2ca58b050aa221fc91b6c02b)
---
.../sidebar/graphic/GraphicPropertyPanel.cxx | 42 ++--
.../sidebar/graphic/GraphicPropertyPanel.hxx | 14 +-
main/svx/source/sidebar/tools/ColorControl.cxx | 254 +++--
main/svx/source/sidebar/tools/ColorPopup.cxx | 34 +--
4 files changed, 176 insertions(+), 168 deletions(-)
diff --git a/main/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
b/main/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
index 4db319e00a..f17f4ef832 100644
--- a/main/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
+++ b/main/svx/source/sidebar/graphic/GraphicPropertyPanel.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,18 +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.
- *
+ *
*/
+
+
#include
#include
#include
@@ -53,7 +55,7 @@ GraphicPropertyPanel::GraphicPropertyPanel(
const cssu::Reference& rxFrame,
SfxBindings* pBindings)
: Control(
-pParent,
+pParent,
SVX_RES(RID_SIDEBAR_GRAPHIC_PANEL)),
mpFtBrightness(new FixedText(this, SVX_RES(FT_BRIGHTNESS))),
mpMtrBrightness(new MetricField(this, SVX_RES(MTR_BRIGHTNESS))),
@@ -89,22 +91,22 @@ GraphicPropertyPanel::GraphicPropertyPanel(
// Setup the grid layouter.
maLayouter.GetCell(0,0).SetControl(*mpFtBrightness).SetGridWidth(2);
maLayouter.GetCell(1,0).SetControl(*mpMtrBrightness).SetGridWidth(2);
-
+
maLayouter.GetCell(0,3).SetControl(*mpFtContrast).SetGridWidth(2);
maLayouter.GetCell(1,3).SetControl(*mpMtrContrast).SetGridWidth(2);
-
+
maLayouter.GetCell(2,0).SetControl(*mpFtColorMode).SetGridWidth(2);
maLayouter.GetCell(3,0).SetControl(*mpLBColorMode).SetGridWidth(2);
-
+
maLayouter.GetCell(2,3).SetControl(*mpFtTrans).SetGridWidth(2);
maLayouter.GetCell(3,3).SetControl(*mpMtrTrans).SetGridWidth(2);
-
+
maLayouter.GetCell(4,0).SetControl(maImgRed).SetFixedWidth();
maLayouter.GetCell(4,1).SetControl(*mpMtrRed);
maLayouter.GetCell(5,0).SetControl(maImgBlue).SetFixedWidth();
maLayouter.GetCell(5,1).SetControl(*mpMtrBlue);
-
+
maLayouter.GetCell(4,3).SetControl(maImgGreen).SetFixedWidth();
maLayouter.GetCell(4,4).SetControl(*mpMtrGreen);
maLayouter.GetCell(5,3).SetControl(maImgGamma).SetFixedWidth();
@@ -125,7 +127,7 @@ GraphicPropertyPanel::GraphicPropertyPanel(
.SetWeight(1)
.SetMinimumWidth(Layouter::MapWidth(*this, MBOX_WIDTH - 10))
.SetRightPadding(Layouter::MapWidth(*this,SECTIONPAGE_MARGIN_HORIZONTAL));
-
+
// Make controls that display text handle short widths more
// graceful.
Layouter::PrepareForLayouting(*mpFtBrightness);
@@ -304,12 +306,12 @@ GraphicPropertyPanel* GraphicPropertyPanel::Create (
SfxBindings* pBindings)
{
if (pParent == NULL)
-throw lang::IllegalArgumentException(A2S("no parent Window given to
GraphicPropertyPanel::Create"), NULL, 0);
+throw lang::IllegalArgumentException(A2S("no parent window given to
GraphicPropertyPanel::Create"), NULL, 0);
if ( ! rxFrame.is())
throw lang::IllegalArgumentException(A2S("no XFrame given to
GraphicPropertyPanel::Create"), NULL, 1);
if (pBindings == NULL)
throw lang::IllegalArgumentException(A2S("no SfxBindings given to
GraphicPropertyPanel::Create"), NULL, 2);
-
+
return new GraphicPropertyPanel(
pParent,
rxFrame,
@@ -322,15 +324,15 @@ void GraphicPropertyPanel::DataChanged(
const DataChangedEvent& rEvent)
{
(void)rEvent;
-
+
SetupIcons();
}
[openoffice] branch trunk updated: Fixed typos, removed whitespace
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new 6e49663196 Fixed typos, removed whitespace
6e49663196 is described below
commit 6e496631967b81de2ca58b050aa221fc91b6c02b
Author: mseidel
AuthorDate: Sat Sep 17 15:46:45 2022 +0200
Fixed typos, removed whitespace
---
.../sidebar/graphic/GraphicPropertyPanel.cxx | 42 ++--
.../sidebar/graphic/GraphicPropertyPanel.hxx | 14 +-
main/svx/source/sidebar/tools/ColorControl.cxx | 254 +++--
main/svx/source/sidebar/tools/ColorPopup.cxx | 34 +--
4 files changed, 176 insertions(+), 168 deletions(-)
diff --git a/main/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
b/main/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
index 4db319e00a..f17f4ef832 100644
--- a/main/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
+++ b/main/svx/source/sidebar/graphic/GraphicPropertyPanel.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,18 +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.
- *
+ *
*/
+
+
#include
#include
#include
@@ -53,7 +55,7 @@ GraphicPropertyPanel::GraphicPropertyPanel(
const cssu::Reference& rxFrame,
SfxBindings* pBindings)
: Control(
-pParent,
+pParent,
SVX_RES(RID_SIDEBAR_GRAPHIC_PANEL)),
mpFtBrightness(new FixedText(this, SVX_RES(FT_BRIGHTNESS))),
mpMtrBrightness(new MetricField(this, SVX_RES(MTR_BRIGHTNESS))),
@@ -89,22 +91,22 @@ GraphicPropertyPanel::GraphicPropertyPanel(
// Setup the grid layouter.
maLayouter.GetCell(0,0).SetControl(*mpFtBrightness).SetGridWidth(2);
maLayouter.GetCell(1,0).SetControl(*mpMtrBrightness).SetGridWidth(2);
-
+
maLayouter.GetCell(0,3).SetControl(*mpFtContrast).SetGridWidth(2);
maLayouter.GetCell(1,3).SetControl(*mpMtrContrast).SetGridWidth(2);
-
+
maLayouter.GetCell(2,0).SetControl(*mpFtColorMode).SetGridWidth(2);
maLayouter.GetCell(3,0).SetControl(*mpLBColorMode).SetGridWidth(2);
-
+
maLayouter.GetCell(2,3).SetControl(*mpFtTrans).SetGridWidth(2);
maLayouter.GetCell(3,3).SetControl(*mpMtrTrans).SetGridWidth(2);
-
+
maLayouter.GetCell(4,0).SetControl(maImgRed).SetFixedWidth();
maLayouter.GetCell(4,1).SetControl(*mpMtrRed);
maLayouter.GetCell(5,0).SetControl(maImgBlue).SetFixedWidth();
maLayouter.GetCell(5,1).SetControl(*mpMtrBlue);
-
+
maLayouter.GetCell(4,3).SetControl(maImgGreen).SetFixedWidth();
maLayouter.GetCell(4,4).SetControl(*mpMtrGreen);
maLayouter.GetCell(5,3).SetControl(maImgGamma).SetFixedWidth();
@@ -125,7 +127,7 @@ GraphicPropertyPanel::GraphicPropertyPanel(
.SetWeight(1)
.SetMinimumWidth(Layouter::MapWidth(*this, MBOX_WIDTH - 10))
.SetRightPadding(Layouter::MapWidth(*this,SECTIONPAGE_MARGIN_HORIZONTAL));
-
+
// Make controls that display text handle short widths more
// graceful.
Layouter::PrepareForLayouting(*mpFtBrightness);
@@ -304,12 +306,12 @@ GraphicPropertyPanel* GraphicPropertyPanel::Create (
SfxBindings* pBindings)
{
if (pParent == NULL)
-throw lang::IllegalArgumentException(A2S("no parent Window given to
GraphicPropertyPanel::Create"), NULL, 0);
+throw lang::IllegalArgumentException(A2S("no parent window given to
GraphicPropertyPanel::Create"), NULL, 0);
if ( ! rxFrame.is())
throw lang::IllegalArgumentException(A2S("no XFrame given to
GraphicPropertyPanel::Create"), NULL, 1);
if (pBindings == NULL)
throw lang::IllegalArgumentException(A2S("no SfxBindings given to
GraphicPropertyPanel::Create"), NULL, 2);
-
+
return new GraphicPropertyPanel(
pParent,
rxFrame,
@@ -322,15 +324,15 @@ void GraphicPropertyPanel::DataChanged(
const DataChangedEvent& rEvent)
{
(void)rEvent;
-
+
SetupIcons();
}
//
-void GraphicPropertyPanel::NotifyItemUpdate(
-
