strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

convert add/remove autoformats to new layout dialogs

Browse source 
Change-Id: I79d658b4e8e1342c012a4bc52b3204ccceaa5520
This commit is contained in:
Caolán McNamara 2012-09-25 12:10:02 +01:00
parent 29f162da2c
commit 390abf002b
8 changed files with 13 additions and 144 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
sw/AllLangResTarget_sw.mk
View file

@ -176,7 +176,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
sw/source/ui/table/rowht.src \
sw/source/ui/table/table.src \
sw/source/ui/table/tabledlg.src \
sw/source/ui/table/tautofmt.src \
sw/source/ui/uiview/pview.src \
sw/source/ui/uiview/view.src \
sw/source/ui/utlui/attrdesc.src \

1
sw/UI_swriter.mk
View file

@ -18,6 +18,7 @@ $(eval $(call gb_UI_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/linenumbering \
sw/uiconfig/swriter/ui/printeroptions \
sw/uiconfig/swriter/ui/splittable \
sw/uiconfig/swriter/ui/stringinput \
sw/uiconfig/swriter/ui/titlepage \
sw/uiconfig/swriter/ui/wordcount \
))

1
sw/inc/helpid.h
View file

@ -341,7 +341,6 @@
#define HID_EDIT_FORMULA "SW_HID_EDIT_FORMULA"
#define HID_INSERT_FILE "SW_HID_INSERT_FILE"
#define HID_FORMAT_PAGE "SW_HID_FORMAT_PAGE"
#define HID_SWDLG_STRINPUT "SW_HID_SWDLG_STRINPUT"
#define HID_RENAME_GLOSSARY "SW_HID_RENAME_GLOSSARY"
#define HID_CONFIG_MENU "SW_HID_CONFIG_MENU"
#define HID_NAVIGATION_PI "SW_HID_NAVIGATION_PI"

2
sw/source/ui/inc/table.hrc
View file

@ -26,7 +26,7 @@
#define MSG_ERR_TABLE_MERGE (RC_TABLE_BEGIN + 7)
#define DLG_SWDLG_STRINPUT (RC_TABLE_BEGIN + 10)
#define TP_TABLE_COLUMN (RC_TABLE_BEGIN + 11)
#define DLG_INSERT_CHART (RC_TABLE_BEGIN + 12)
#define MSG_WRONG_TABLENAME (RC_TABLE_BEGIN + 13)

31
sw/source/ui/table/tautofmt.cxx
View file

@ -45,7 +45,6 @@
#include "tblafmt.hxx"
#include "tautofmt.hxx"
#include "shellres.hxx"
#include "tautofmt.hrc"
using namespace com::sun::star;
@ -123,36 +122,26 @@ public:
void GetInputString( String& rString ) const;
private:
Edit aEdInput; // Edit erhaelt so den Focus
FixedText aFtEditTitle;
OKButton aBtnOk;
CancelButton aBtnCancel;
Edit* m_pEdInput; // Edit erhaelt so den Focus
};
SwStringInputDlg::SwStringInputDlg( Window* pParent,
const String& rTitle,
const String& rEditTitle,
const String& rDefault ) :
ModalDialog ( pParent, SW_RES( DLG_SWDLG_STRINPUT ) ),
//
aEdInput ( this, SW_RES( ED_INPUT ) ),
aFtEditTitle ( this, SW_RES( FT_LABEL ) ),
aBtnOk ( this, SW_RES( BTN_OK ) ),
aBtnCancel ( this, SW_RES( BTN_CANCEL ) )
SwStringInputDlg::SwStringInputDlg(Window* pParent, const String& rTitle,
const String& rEditTitle, const String& rDefault)
: ModalDialog(pParent, "StringInputDialog", "modules/swriter/ui/stringinput.ui")
{
SetText( rTitle );
aFtEditTitle.SetText( rEditTitle );
aEdInput.SetText( rDefault );
//-------------
FreeResource();
get<FixedText>("name")->SetText(rEditTitle);
get(m_pEdInput, "edit");
SetText(rTitle);
m_pEdInput->SetText(rDefault);
}
//------------------------------------------------------------------------
void SwStringInputDlg::GetInputString( String& rString ) const
{
rString = aEdInput.GetText();
rString = m_pEdInput->GetText();
}

54
sw/source/ui/table/tautofmt.hrc
View file

@ -1,54 +0,0 @@
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* 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 with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef SW_TAUTOFMT_HRC
#define SW_TAUTOFMT_HRC
#include "table.hrc"
// allgemein
#define BTN_OK 100
#define BTN_CANCEL 102
#define BTN_HELP 103
#define BTN_MORE 104
#define BTN_ADD 105
#define BTN_REMOVE 106
#define BTN_RENAME 107
#define FT_LABEL 110
#define FL_FRAME 111
#define STR_BTN_CLOSE 200
// Autoformat
#define LB_FORMAT 1
#define FL_FORMAT 9
#define FL_FORMATS 29
#define WND_PREVIEW 19
#define BTN_NUMFORMAT 20
#define BTN_BORDER 21
#define BTN_FONT 23
#define BTN_PATTERN 24
#define BTN_ALIGNMENT 25
// Gruppierung setzen/aufheben:
#define BTN_GROUP_COLS 1
#define BTN_GROUP_ROWS 3
#define STR_GROUP 1
#define STR_UNGROUP 2
#define ED_INPUT 1
#endif

65
sw/source/ui/table/tautofmt.src
View file

@ -1,65 +0,0 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License version 3
* only, as published by the Free Software Foundation.
*
* OpenOffice.org is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License version 3 for more details
* (a copy is included in the LICENSE file that accompanied this code).
*
* You should have received a copy of the GNU Lesser General Public License
* version 3 along with OpenOffice.org. If not, see
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
************************************************************************/
#include "tautofmt.hrc"
#include "helpid.h"
ModalDialog DLG_SWDLG_STRINPUT
{
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 172 , 63 ) ;
Moveable = TRUE ;
Closeable = TRUE ;
HelpID = HID_SWDLG_STRINPUT ;
Edit ED_INPUT
{
HelpID = "sw:Edit:DLG_SWDLG_STRINPUT:ED_INPUT";
Border = TRUE ;
Pos = MAP_APPFONT ( 6 , 24 ) ;
Size = MAP_APPFONT ( 104 , 12 ) ;
TabStop = TRUE ;
};
FixedText FT_LABEL
{
Pos = MAP_APPFONT ( 6 , 13 ) ;
Size = MAP_APPFONT ( 90 , 10 ) ;
Text = "Label" ;
};
OKButton BTN_OK
{
Pos = MAP_APPFONT ( 116 , 6 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
DefButton = TRUE ;
};
CancelButton BTN_CANCEL
{
Pos = MAP_APPFONT ( 116 , 23 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
};
};

2
vcl/source/window/window2.cxx
View file

@ -2032,7 +2032,7 @@ bool Window::set_property(const rtl::OString &rKey, const rtl::OString &rValue)
set_margin_bottom(rValue.toInt32());
else
{
fprintf(stderr, "unhandled property %s\n", rKey.getStr());
SAL_WARN("vcl.layout", "unhandled property: " << rKey.getStr());
return false;
}
return true;