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 2020/05/02 23:24:00 UTC
[openoffice] branch AOO418 updated: Fixed CheckBox error in dialog
for Floating Frames (Writer)
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO418
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO418 by this push:
new 3b62787 Fixed CheckBox error in dialog for Floating Frames (Writer)
3b62787 is described below
commit 3b62787e22f6fcb6d297ab2eb7f95fd48ec2d67c
Author: mseidel <ms...@apache.org>
AuthorDate: Sun May 3 01:21:13 2020 +0200
Fixed CheckBox error in dialog for Floating Frames (Writer)
(cherry picked from commit 268e712999d6edb95e834712355be3f9c8883a35)
---
main/cui/source/dialogs/insdlg.cxx | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/main/cui/source/dialogs/insdlg.cxx b/main/cui/source/dialogs/insdlg.cxx
index 920f079..3d3d7c2 100644
--- a/main/cui/source/dialogs/insdlg.cxx
+++ b/main/cui/source/dialogs/insdlg.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,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.
- *
+ *
*************************************************************/
@@ -749,7 +749,7 @@ SfxInsertFloatingFrameDialog::SfxInsertFloatingFrameDialog( Window *pParent,
, aFLMargin( this, CUI_RES( GB_MARGIN ) )
, aFTMarginWidth ( this, CUI_RES( FT_MARGINWIDTH ) )
, aNMMarginWidth ( this, CUI_RES( NM_MARGINWIDTH ) )
- , aCBMarginWidthDefault( this, CUI_RES( CB_MARGINHEIGHTDEFAULT ) )
+ , aCBMarginWidthDefault( this, CUI_RES( CB_MARGINWIDTHDEFAULT ) )
, aFTMarginHeight ( this, CUI_RES( FT_MARGINHEIGHT ) )
, aNMMarginHeight ( this, CUI_RES( NM_MARGINHEIGHT ) )
, aCBMarginHeightDefault( this, CUI_RES( CB_MARGINHEIGHTDEFAULT ) )
@@ -796,7 +796,7 @@ SfxInsertFloatingFrameDialog::SfxInsertFloatingFrameDialog( Window *pParent, con
, aFLMargin( this, CUI_RES( GB_MARGIN ) )
, aFTMarginWidth ( this, CUI_RES( FT_MARGINWIDTH ) )
, aNMMarginWidth ( this, CUI_RES( NM_MARGINWIDTH ) )
- , aCBMarginWidthDefault( this, CUI_RES( CB_MARGINHEIGHTDEFAULT ) )
+ , aCBMarginWidthDefault( this, CUI_RES( CB_MARGINWIDTHDEFAULT ) )
, aFTMarginHeight ( this, CUI_RES( FT_MARGINHEIGHT ) )
, aNMMarginHeight ( this, CUI_RES( NM_MARGINHEIGHT ) )
, aCBMarginHeightDefault( this, CUI_RES( CB_MARGINHEIGHTDEFAULT ) )