Skip to content

C
core
Kaydet (Commit) e51f2474 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

flatten ShellResource resource 

Change-Id: I6094f86eb7da89ba5e21be909417b23f9f375351
üst 1c48275a
Hide whitespace changes
Inline Side-by-side
Showing with 203 additions and 240 deletions
sw/inc/shellres.hxx
Dosyayı görüntüle @ e51f2474
......@@ -24,7 +24,7 @@
#include <tools/rc.hxx>
#include <vcl/bitmap.hxx>
struct SW_DLLPUBLIC ShellResource : public Resource
struct SW_DLLPUBLIC ShellResource
{
OUString aPostItAuthor;
OUString aPostItPage;
......@@ -80,7 +80,6 @@ struct SW_DLLPUBLIC ShellResource : public Resource
OUString GetPageDescName(sal_uInt16 nNo, PageNameMode eMode);
ShellResource();
~ShellResource();
private:
void GetAutoFormatNameLst_() const;
......
sw/source/uibase/inc/utlui.hrc
Dosyayı görüntüle @ e51f2474
......@@ -22,7 +22,6 @@
#include "rcid.hrc"
#define RID_SW_SHELLRES (RC_UTLUI_BEGIN + 1)
#define RID_STR_SYSTEM (RC_UTLUI_BEGIN + 2)
// Strings in NumberFormatter-Listbox
......@@ -70,7 +69,7 @@
#define STR_CONTENT_TYPE_SINGLE_DRAWOBJECT (STR_CONTENT_TYPE_SINGLE_FIRST + 11)
#define STR_CONTENT_SINGLE_END STR_CONTENT_TYPE_SINGLE_DRAWOBJECT
#define FLD_DOCINFO_BEGIN STR_CONTENT_SINGLE_END
#define FLD_DOCINFO_BEGIN (STR_CONTENT_SINGLE_END + 1)
#define FLD_DOCINFO_TITEL FLD_DOCINFO_BEGIN
#define FLD_DOCINFO_THEMA (FLD_DOCINFO_BEGIN + 1)
#define FLD_DOCINFO_KEYS (FLD_DOCINFO_BEGIN + 2)
......@@ -190,7 +189,42 @@
#define STR_IDXEXAMPLE_IDXTXT_IMAGE1 (STR_IDXEXAMPLE_IDXTXT_BEGIN + 8)
#define STR_IDXEXAMPLE_IDXTXT_END STR_IDXEXAMPLE_IDXTXT_IMAGE1
#if STR_IDXEXAMPLE_IDXTXT_END > RC_IDXTXT_END
#define RID_SW_SHELLRES_BEGIN (STR_IDXEXAMPLE_IDXTXT_IMAGE1 + 1)
#define STR_POSTIT_PAGE (RID_SW_SHELLRES_BEGIN + 1)
#define STR_POSTIT_AUTHOR (RID_SW_SHELLRES_BEGIN + 2)
#define STR_CALC_SYNTAX (RID_SW_SHELLRES_BEGIN + 3)
#define STR_CALC_ZERODIV (RID_SW_SHELLRES_BEGIN + 4)
#define STR_CALC_BRACK (RID_SW_SHELLRES_BEGIN + 5)
#define STR_CALC_POW (RID_SW_SHELLRES_BEGIN + 6)
#define STR_CALC_VARNFND (RID_SW_SHELLRES_BEGIN + 7)
#define STR_CALC_OVERFLOW (RID_SW_SHELLRES_BEGIN + 8)
#define STR_CALC_WRONGTIME (RID_SW_SHELLRES_BEGIN + 9)
#define STR_CALC_DEFAULT (RID_SW_SHELLRES_BEGIN + 10)
#define STR_CALC_ERROR (RID_SW_SHELLRES_BEGIN + 11)
#define STR_GETREFFLD_UP (RID_SW_SHELLRES_BEGIN + 12)
#define STR_GETREFFLD_DOWN (RID_SW_SHELLRES_BEGIN + 13)
#define STR_ALLPAGE_HEADFOOT (RID_SW_SHELLRES_BEGIN + 14)
#define STR_TEMPLATE_NONE (RID_SW_SHELLRES_BEGIN + 15)
#define STR_POSTIT_LINE (RID_SW_SHELLRES_BEGIN + 16)
#define STR_FIELD_FIXED (RID_SW_SHELLRES_BEGIN + 17)
#define STR_TOI (RID_SW_SHELLRES_BEGIN + 18)
#define STR_TOU (RID_SW_SHELLRES_BEGIN + 19)
#define STR_TOC (RID_SW_SHELLRES_BEGIN + 20)
#define STR_TOX_ILL (RID_SW_SHELLRES_BEGIN + 21)
#define STR_TOX_OBJ (RID_SW_SHELLRES_BEGIN + 22)
#define STR_TOX_TBL (RID_SW_SHELLRES_BEGIN + 23)
#define STR_TOX_AUTH (RID_SW_SHELLRES_BEGIN + 24)
#define STR_PAGEDESC_NAME (RID_SW_SHELLRES_BEGIN + 25)
#define STR_PAGEDESC_FIRSTNAME (RID_SW_SHELLRES_BEGIN + 26)
#define STR_PAGEDESC_FOLLOWNAME (RID_SW_SHELLRES_BEGIN + 27)
#define STR_LINK_CTRL_CLICK (RID_SW_SHELLRES_BEGIN + 28)
#define STR_LINK_CLICK (RID_SW_SHELLRES_BEGIN + 29)
#define STR_GETREFFLD_REFITEMNOTFOUND (RID_SW_SHELLRES_BEGIN + 30)
#define STR_DURATION_FORMAT (RID_SW_SHELLRES_BEGIN + 31)
#define STR_TOX_CITATION (RID_SW_SHELLRES_BEGIN + 32)
#define RID_SW_SHELLRES_END STR_TOX_CITATION
#if STR_IDXEXAMPLE_IDXTXT_END > RID_SW_SHELLRES_END
#error Resource-Id Ueberlauf in #file, #line
#endif
......
sw/source/uibase/utlui/initui.cxx
Dosyayı görüntüle @ e51f2474
......@@ -30,7 +30,6 @@
#include <gloslst.hxx>
#include <utlui.hrc>
#include <initui.hrc>
#include <comcore.hrc>
#include <authfld.hxx>
#include <dbmgr.hxx>
......@@ -175,8 +174,7 @@ void InitUI()
}
ShellResource::ShellResource()
: Resource( SW_RES(RID_SW_SHELLRES) ),
aPostItAuthor( SW_RES( STR_POSTIT_AUTHOR ) ),
: aPostItAuthor( SW_RES( STR_POSTIT_AUTHOR ) ),
aPostItPage( SW_RES( STR_POSTIT_PAGE ) ),
aPostItLine( SW_RES( STR_POSTIT_LINE ) ),
......@@ -222,12 +220,6 @@ ShellResource::ShellResource()
for(sal_uInt16 i = 0; i < nCount; ++i)
aDocInfoLst.push_back(OUString(SW_RESSTR(FLD_DOCINFO_BEGIN + i)));
FreeResource();
}
ShellResource::~ShellResource()
{
}
OUString ShellResource::GetPageDescName(sal_uInt16 nNo, PageNameMode eMode)
......
sw/source/uibase/utlui/initui.hrc deleted 100644 → 0
Dosyayı görüntüle @ 1c48275a
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* 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 INCLUDED_SW_SOURCE_UIBASE_UTLUI_INITUI_HRC
#define INCLUDED_SW_SOURCE_UIBASE_UTLUI_INITUI_HRC
// Local Resources for the shells:
#define STR_POSTIT_PAGE 1
#define STR_POSTIT_AUTHOR 2
#define STR_CALC_SYNTAX 3
#define STR_CALC_ZERODIV 4
#define STR_CALC_BRACK 5
#define STR_CALC_POW 6
#define STR_CALC_VARNFND 7
#define STR_CALC_OVERFLOW 8
#define STR_CALC_WRONGTIME 9
#define STR_CALC_DEFAULT 10
#define STR_CALC_ERROR 11
#define STR_GETREFFLD_UP 12
#define STR_GETREFFLD_DOWN 13
#define STR_ALLPAGE_HEADFOOT 14
#define STR_TEMPLATE_NONE 15
#define STR_POSTIT_LINE 16
#define STR_FIELD_FIXED 17
#define STR_TOI 18
#define STR_TOU 19
#define STR_TOC 20
#define STR_TOX_ILL 21
#define STR_TOX_OBJ 22
#define STR_TOX_TBL 23
#define STR_TOX_AUTH 24
#define STR_PAGEDESC_NAME 25
#define STR_PAGEDESC_FIRSTNAME 26
#define STR_PAGEDESC_FOLLOWNAME 27
#define STR_LINK_CTRL_CLICK 28
#define STR_LINK_CLICK 29
#define STR_GETREFFLD_REFITEMNOTFOUND 30
#define STR_DURATION_FORMAT 31
#define STR_TOX_CITATION 32
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sw/source/uibase/utlui/initui.src
Dosyayı görüntüle @ e51f2474
......@@ -20,185 +20,181 @@
#include "globals.hrc"
#include "utlui.hrc"
#include "helpid.h"
#include "initui.hrc"
// Error calculator
Resource RID_SW_SHELLRES
{
String STR_POSTIT_PAGE
{
Text [ en-US ] = "Page" ;
};
String STR_POSTIT_LINE
{
Text [ en-US ] = "Line" ;
};
String STR_POSTIT_AUTHOR
{
Text [ en-US ] = "Author" ;
};
String STR_CALC_SYNTAX
{
Text [ en-US ] = "** Syntax Error **" ;
};
String STR_CALC_ZERODIV
{
Text [ en-US ] = "** Division by zero **" ;
};
String STR_CALC_BRACK
{
Text [ en-US ] = "** Wrong use of brackets **" ;
};
String STR_CALC_POW
{
Text [ en-US ] = "** Square function overflow **" ;
};
String STR_CALC_VARNFND
{
Text [ en-US ] = "** Variable not found **" ;
};
String STR_CALC_OVERFLOW
{
Text [ en-US ] = "** Overflow **" ;
};
String STR_CALC_WRONGTIME
{
Text [ en-US ] = "** Wrong time format **" ;
};
String STR_CALC_DEFAULT
{
Text [ en-US ] = "** Error **" ;
};
String STR_CALC_ERROR
{
Text [ en-US ] = "** Expression is faulty **" ;
};
String STR_GETREFFLD_UP
{
Text [ en-US ] = "above" ;
};
String STR_GETREFFLD_DOWN
{
Text [ en-US ] = "below" ;
};
String STR_GETREFFLD_REFITEMNOTFOUND
{
Text [ en-US ] = "Error: Reference source not found" ;
};
String STR_ALLPAGE_HEADFOOT
{
Text [ en-US ] = "All" ;
};
String STR_TEMPLATE_NONE
{
Text [ en-US ] = "None" ;
};
String STR_FIELD_FIXED
{
Text [ en-US ] = "(fixed)" ;
};
String STR_DURATION_FORMAT
{
Text [en-US] = " Y: %1 M: %2 D: %3 H: %4 M: %5 S: %6";
};
String STR_TOI
{
Text [ en-US ] = "Alphabetical Index" ;
};
String STR_POSTIT_PAGE
{
Text [ en-US ] = "Page" ;
};
String STR_POSTIT_LINE
{
Text [ en-US ] = "Line" ;
};
String STR_POSTIT_AUTHOR
{
Text [ en-US ] = "Author" ;
};
String STR_CALC_SYNTAX
{
Text [ en-US ] = "** Syntax Error **" ;
};
String STR_CALC_ZERODIV
{
Text [ en-US ] = "** Division by zero **" ;
};
String STR_CALC_BRACK
{
Text [ en-US ] = "** Wrong use of brackets **" ;
};
String STR_CALC_POW
{
Text [ en-US ] = "** Square function overflow **" ;
};
String STR_CALC_VARNFND
{
Text [ en-US ] = "** Variable not found **" ;
};
String STR_CALC_OVERFLOW
{
Text [ en-US ] = "** Overflow **" ;
};
String STR_CALC_WRONGTIME
{
Text [ en-US ] = "** Wrong time format **" ;
};
String STR_CALC_DEFAULT
{
Text [ en-US ] = "** Error **" ;
};
String STR_CALC_ERROR
{
Text [ en-US ] = "** Expression is faulty **" ;
};
String STR_GETREFFLD_UP
{
Text [ en-US ] = "above" ;
};
String STR_GETREFFLD_DOWN
{
Text [ en-US ] = "below" ;
};
String STR_GETREFFLD_REFITEMNOTFOUND
{
Text [ en-US ] = "Error: Reference source not found" ;
};
String STR_ALLPAGE_HEADFOOT
{
Text [ en-US ] = "All" ;
};
String STR_TEMPLATE_NONE
{
Text [ en-US ] = "None" ;
};
String STR_FIELD_FIXED
{
Text [ en-US ] = "(fixed)" ;
};
String STR_DURATION_FORMAT
{
Text [en-US] = " Y: %1 M: %2 D: %3 H: %4 M: %5 S: %6";
};
String STR_TOI
{
Text [ en-US ] = "Alphabetical Index" ;
};
String STR_TOU
{
Text [ en-US ] = "User-Defined" ;
};
String STR_TOU
{
Text [ en-US ] = "User-Defined" ;
};
String STR_TOC
{
Text [ en-US ] = "Table of Contents" ;
};
String STR_TOC
{
Text [ en-US ] = "Table of Contents" ;
};
String STR_TOX_AUTH
{
Text [ en-US ] = "Bibliography";
};
String STR_TOX_AUTH
{
Text [ en-US ] = "Bibliography";
};
String STR_TOX_CITATION
{
Text [ en-US ] = "Citation";
};
String STR_TOX_CITATION
{
Text [ en-US ] = "Citation";
};
String STR_TOX_TBL
{
Text [ en-US ] = "Index of Tables";
};
String STR_TOX_OBJ
{
Text [ en-US ] = "Table of Objects";
};
String STR_TOX_ILL
{
Text [ en-US ] = "Illustration Index";
};
String STR_LINK_CTRL_CLICK
{
Text [ en-US ] = "%s-Click to follow link";
};
String STR_LINK_CLICK
{
Text [ en-US ] = "Click to follow link";
};
String STR_TOX_TBL
{
Text [ en-US ] = "Index of Tables";
};
String STR_TOX_OBJ
{
Text [ en-US ] = "Table of Objects";
};
String STR_TOX_ILL
{
Text [ en-US ] = "Illustration Index";
};
String STR_LINK_CTRL_CLICK
{
Text [ en-US ] = "%s-Click to follow link";
};
String STR_LINK_CLICK
{
Text [ en-US ] = "Click to follow link";
};
// SubType DocInfo
// SubType DocInfo
String FLD_DOCINFO_TITEL
{
Text [ en-US ] = "Title" ;
};
String FLD_DOCINFO_THEMA
{
Text [ en-US ] = "Subject" ;
};
String FLD_DOCINFO_KEYS
{
Text [ en-US ] = "Keywords" ;
};
String FLD_DOCINFO_COMMENT
{
Text [ en-US ] = "Comments" ;
};
String FLD_DOCINFO_CREATE
{
Text [ en-US ] = "Created" ;
};
String FLD_DOCINFO_CHANGE
{
Text [ en-US ] = "Modified" ;
};
String FLD_DOCINFO_PRINT
{
Text [ en-US ] = "Last printed" ;
};
String FLD_DOCINFO_DOCNO
{
Text [ en-US ] = "Revision number" ;
};
String FLD_DOCINFO_EDIT
{
Text [ en-US ] = "Total editing time" ;
};
String FLD_DOCINFO_TITEL
{
Text [ en-US ] = "Title" ;
};
String FLD_DOCINFO_THEMA
{
Text [ en-US ] = "Subject" ;
};
String FLD_DOCINFO_KEYS
{
Text [ en-US ] = "Keywords" ;
};
String FLD_DOCINFO_COMMENT
{
Text [ en-US ] = "Comments" ;
};
String FLD_DOCINFO_CREATE
{
Text [ en-US ] = "Created" ;
};
String FLD_DOCINFO_CHANGE
{
Text [ en-US ] = "Modified" ;
};
String FLD_DOCINFO_PRINT
{
Text [ en-US ] = "Last printed" ;
};
String FLD_DOCINFO_DOCNO
{
Text [ en-US ] = "Revision number" ;
};
String FLD_DOCINFO_EDIT
{
Text [ en-US ] = "Total editing time" ;
};
String STR_PAGEDESC_NAME
{
Text [ en-US ] = "Convert $(ARG1)";
};
String STR_PAGEDESC_FIRSTNAME
{
Text [ en-US ] = "First convert $(ARG1)";
};
String STR_PAGEDESC_FOLLOWNAME
{
Text [ en-US ] = "Next convert $(ARG1)";
};
String STR_PAGEDESC_NAME
{
Text [ en-US ] = "Convert $(ARG1)";
};
String STR_PAGEDESC_FIRSTNAME
{
Text [ en-US ] = "First convert $(ARG1)";
};
String STR_PAGEDESC_FOLLOWNAME
{
Text [ en-US ] = "Next convert $(ARG1)";
};
String STR_AUTH_TYPE_ARTICLE
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment