[Libreoffice-commits] .: binfilter/bf_sw binfilter/prj

Christian Lohmaier cloph at kemper.freedesktop.org
Sun Feb 27 08:48:20 PST 2011


 binfilter/bf_sw/source/ui/dochdl/dochdl.hrc    |   49 -------
 binfilter/bf_sw/source/ui/dochdl/makefile.mk   |   60 ---------
 binfilter/bf_sw/source/ui/dochdl/selglos.hrc   |   31 -----
 binfilter/bf_sw/source/ui/dochdl/sw_dochdl.src |  155 -------------------------
 binfilter/bf_sw/source/ui/makefile.mk          |    1 
 binfilter/bf_sw/util/makefile.mk               |    1 
 binfilter/prj/build.lst                        |    3 
 7 files changed, 1 insertion(+), 299 deletions(-)

New commits:
commit 4a95a625e4bd07067a81ba37b39ad6cc7e6e16c5
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Sun Feb 27 17:04:46 2011 +0100

    When removing stuff, the least thing to do is a clean build of the module

diff --git a/binfilter/bf_sw/source/ui/dochdl/dochdl.hrc b/binfilter/bf_sw/source/ui/dochdl/dochdl.hrc
deleted file mode 100644
index d2c6072..0000000
--- a/binfilter/bf_sw/source/ui/dochdl/dochdl.hrc
+++ /dev/null
@@ -1,49 +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.
- *
- ************************************************************************/
-
-#ifndef _DOCHDL_HRC
-#define _DOCHDL_HRC
-
-#include "rcid.hrc"
-
-
-
-#define STR_PRIVATETEXT    			(RC_DOCHDL_BEGIN + 8)
-#define STR_PRIVATEGRAPHIC 			(RC_DOCHDL_BEGIN + 9)
-#define STR_PRIVATEOLE 	   			(RC_DOCHDL_BEGIN + 10)
-#define STR_DDEFORMAT               (RC_DOCHDL_BEGIN + 11)
-
-#define STR_SW_TEAM_NAMES			(RC_DOCHDL_BEGIN + 13)
-
-#define DOCHDL_ACT_END              STR_CANT_EDIT_INFO
-
-#if DOCHDL_ACT_END > RC_DOCHDL_END
-#error Resource-Id Ueberlauf in #file, #line
-#endif
-
-#endif
-
diff --git a/binfilter/bf_sw/source/ui/dochdl/makefile.mk b/binfilter/bf_sw/source/ui/dochdl/makefile.mk
deleted file mode 100644
index c77c362..0000000
--- a/binfilter/bf_sw/source/ui/dochdl/makefile.mk
+++ /dev/null
@@ -1,60 +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.
-#
-#*************************************************************************
-
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
-PRJ=..$/..$/..$/..
-BFPRJ=..$/..$/..
-
-PRJNAME=binfilter
-TARGET=sw_dochdl
-
-NO_HIDS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/inc$/bf_sw$/swpre.mk
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/inc$/bf_sw$/sw.mk
-
-INC+= -I$(PRJ)$/inc$/bf_sw
-# --- Files --------------------------------------------------------
-
-CXXFILES = #\
-#        sw_swdtflvr.cxx
-
-SRS1NAME=$(TARGET)
-SRC1FILES =  \
-        sw_dochdl.src
-
-SLOFILES =  #\
-        $(SLO)$/sw_swdtflvr.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/binfilter/bf_sw/source/ui/dochdl/selglos.hrc b/binfilter/bf_sw/source/ui/dochdl/selglos.hrc
deleted file mode 100644
index f42c5f2..0000000
--- a/binfilter/bf_sw/source/ui/dochdl/selglos.hrc
+++ /dev/null
@@ -1,31 +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.
- *
- ************************************************************************/
-#define BT_OK 		100
-#define BT_CANCEL 	101
-#define BT_HELP		102
-#define LB_GLOS		1
-#define FL_GLOS         2
diff --git a/binfilter/bf_sw/source/ui/dochdl/sw_dochdl.src b/binfilter/bf_sw/source/ui/dochdl/sw_dochdl.src
deleted file mode 100644
index 3d7614b..0000000
--- a/binfilter/bf_sw/source/ui/dochdl/sw_dochdl.src
+++ /dev/null
@@ -1,155 +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.
- *
- ************************************************************************/
-#define NO_LOCALIZE_EXPORT
-
-
-#include "dochdl.hrc"
-#include "globals.hrc"
-
-
-
-
-
-
-String STR_PRIVATETEXT
-{
-    /* ### ACHTUNG: Neuer Text in Resource? StarWriter : Formatierter Text [StarWriter] */
-    Text [ de ] = "%PRODUCTNAME Writer" ;
-    Text [ en-US ] = "%PRODUCTNAME Writer" ;
-    Text [ x-comment ] = " ";
-    Text[ pt ] = "%PRODUCTNAME Writer";
-    Text[ ru ] = "%PRODUCTNAME Writer";
-    Text[ el ] = "%PRODUCTNAME Writer";
-    Text[ nl ] = "%PRODUCTNAME Writer";
-    Text[ fr ] = "%PRODUCTNAME Writer";
-    Text[ es ] = "%PRODUCTNAME Writer";
-    Text[ fi ] = "%PRODUCTNAME Writer";
-    Text[ ca ] = "%PRODUCTNAME Writer";
-    Text[ it ] = "%PRODUCTNAME Writer";
-    Text[ sk ] = "%PRODUCTNAME Writer";
-    Text[ da ] = "%PRODUCTNAME Writer";
-    Text[ sv ] = "%PRODUCTNAME Writer";
-    Text[ pl ] = "%PRODUCTNAME Writer";
-    Text[ pt-BR ] = "%PRODUCTNAME Writer";
-    Text[ th ] = "%PRODUCTNAME Writer";
-    Text[ ja ] = "%PRODUCTNAME Writer";
-    Text[ ko ] = "%PRODUCTNAME Writer";
-    Text[ zh-CN ] = "%PRODUCTNAME Writer";
-    Text[ zh-TW ] = "%PRODUCTNAME Writer";
-    Text[ tr ] = "%PRODUCTNAME Writer";
-    Text[ hi-IN ] = "%PRODUCTNAME लेखक";
-    Text[ ar ] = "%PRODUCTNAME Writer";
-    Text[ he ] = "%PRODUCTNAME Writer";
-};
-String STR_PRIVATEGRAPHIC
-{
-    Text [ de ] = "Grafik [%PRODUCTNAME Writer]" ;
-    Text [ en-US ] = "Graphics [%PRODUCTNAME Writer]" ;
-    Text[ pt ] = "Imagem [%PRODUCTNAME Writer]";
-    Text[ ru ] = "Графический объект [%PRODUCTNAME Writer]";
-    Text[ el ] = "Γραφικό [%PRODUCTNAME Writer]";
-    Text[ nl ] = "Afbeelding [%PRODUCTNAME Writer]";
-    Text[ fr ] = "Image [%PRODUCTNAME Writer]";
-    Text[ es ] = "Imagen [%PRODUCTNAME Writer]";
-    Text[ fi ] = "Grafiikka [%PRODUCTNAME Writer]";
-    Text[ ca ] = "Imatge [%PRODUCTNAME Writer]";
-    Text[ it ] = "Immagine [%PRODUCTNAME Writer]";
-    Text[ sk ] = "Obrázok [%PRODUCTNAME Writer]";
-    Text[ da ] = "Grafik [%PRODUCTNAME Writer]";
-    Text[ sv ] = "Grafik [%PRODUCTNAME Writer]";
-    Text[ pl ] = "[%PRODUCTNAME Writer] - Grafika";
-    Text[ pt-BR ] = "Figura [%PRODUCTNAME Writer]";
-    Text[ th ] = "กราฟิค [%PRODUCTNAME Writer]";
-    Text[ ja ] = "図 [%PRODUCTNAME Writer]";
-    Text[ ko ] = "그림 [%PRODUCTNAME Writer]";
-    Text[ zh-CN ] = "图形 [%PRODUCTNAME Writer]";
-    Text[ zh-TW ] = "圖形 [%PRODUCTNAME Writer]";
-    Text[ tr ] = "Grafik [%PRODUCTNAME Writer]";
-    Text[ hi-IN ] = "सुचित्र [%PRODUCTNAME लेखक]";
-    Text[ ar ] = "[%PRODUCTNAME Writer] رسومات";
-    Text[ he ] = "Grafik [%PRODUCTNAME Writer]";
-};
-String STR_PRIVATEOLE
-{
-    Text [ de ] = "Objekt [%PRODUCTNAME Writer]" ;
-    Text [ en-US ] = "Object [%PRODUCTNAME Writer]" ;
-    Text[ pt ] = "Objecto [%PRODUCTNAME Writer]";
-    Text[ ru ] = "Объект [%PRODUCTNAME Writer]";
-    Text[ el ] = "Αντικείμενο [%PRODUCTNAME Writer]";
-    Text[ nl ] = "Object [%PRODUCTNAME Writer]";
-    Text[ fr ] = "Objet [%PRODUCTNAME Writer]";
-    Text[ es ] = "Objeto [%PRODUCTNAME Writer]";
-    Text[ fi ] = "Objekti [%PRODUCTNAME Writer]";
-    Text[ ca ] = "Objecte [%PRODUCTNAME Writer]";
-    Text[ it ] = "Oggetto [%PRODUCTNAME Writer]";
-    Text[ sk ] = "Objekt [%PRODUCTNAME Writer]";
-    Text[ da ] = "Objekt [%PRODUCTNAME Writer]";
-    Text[ sv ] = "Objekt [%PRODUCTNAME Writer]";
-    Text[ pl ] = "Obiekt [%PRODUCTNAME Writer]";
-    Text[ pt-BR ] = "Objeto [%PRODUCTNAME Writer]";
-    Text[ th ] = "วัตถุ [%PRODUCTNAME Writer]";
-    Text[ ja ] = "オブジェクト [%PRODUCTNAME Writer]";
-    Text[ ko ] = "개체 [%PRODUCTNAME Writer]";
-    Text[ zh-CN ] = "对象 [%PRODUCTNAME Writer]";
-    Text[ zh-TW ] = "物件 [%PRODUCTNAME Writer]";
-    Text[ tr ] = "Nesne [%PRODUCTNAME Writer]";
-    Text[ hi-IN ] = "वस्तु [%PRODUCTNAME लेखक]";
-    Text[ ar ] = "[%PRODUCTNAME Writer]كائن ";
-    Text[ he ] = "Objekt [%PRODUCTNAME Writer]";
-};
-String STR_DDEFORMAT
-{
-    /* ### ACHTUNG: Neuer Text in Resource? DDE Verknüpfung : DDE Verkn³pfung */
-    Text [ de ] = "DDE Verknüpfung" ;
-    Text [ en-US ] = "DDE link" ;
-    Text [ x-comment ] = " ";
-    Text[ pt ] = "Ligação DDE";
-    Text[ ru ] = "Связь по DDE";
-    Text[ el ] = "Σύνδεσμος DDE";
-    Text[ nl ] = "DDE-koppeling";
-    Text[ fr ] = "Lien DDE";
-    Text[ es ] = "Vínculo DDE";
-    Text[ fi ] = "DDE-linkki";
-    Text[ ca ] = "Enllaç DDE";
-    Text[ it ] = "Collegamento DDE";
-    Text[ sk ] = "Odkaz DDE";
-    Text[ da ] = "DDE-kæde";
-    Text[ sv ] = "DDE-länk";
-    Text[ pl ] = "Łącza DDE ";
-    Text[ pt-BR ] = "Vínculo DDE";
-    Text[ th ] = "เชื่อมโยง DDE ";
-    Text[ ja ] = "DDE リンク";
-    Text[ ko ] = "DDE ì—°ê²°";
-    Text[ zh-CN ] = "DDE 链接";
-    Text[ zh-TW ] = "DDE 捷徑";
-    Text[ tr ] = "DDE bağlantısı";
-    Text[ hi-IN ] = "DDE लिंक";
-    Text[ ar ] = "ارتباط DDE";
-    Text[ he ] = "DDE Verknüpfung";
-};
-
-
diff --git a/binfilter/bf_sw/source/ui/makefile.mk b/binfilter/bf_sw/source/ui/makefile.mk
index eafca37..6201ae4 100644
--- a/binfilter/bf_sw/source/ui/makefile.mk
+++ b/binfilter/bf_sw/source/ui/makefile.mk
@@ -63,7 +63,6 @@ LIB1FILES= \
         $(SLB)$/sw_app.lib      \
         $(SLB)$/sw_config.lib   \
         $(SLB)$/sw_dbui.lib     \
-        $(SLB)$/sw_dochdl.lib   \
         $(SLB)$/sw_utlui.lib    \
         $(SLB)$/sw_fldui.lib    \
         $(SLB)$/sw_globdoc.lib  \
diff --git a/binfilter/bf_sw/util/makefile.mk b/binfilter/bf_sw/util/makefile.mk
index 413931e..86d4040 100644
--- a/binfilter/bf_sw/util/makefile.mk
+++ b/binfilter/bf_sw/util/makefile.mk
@@ -55,7 +55,6 @@ MYRESLIBNAME=sw
 sw_res_files= \
     $(SRS)$/sw_app.srs          \
     $(SRS)$/sw_config.srs       \
-    $(SRS)$/sw_dochdl.srs       \
     $(SRS)$/sw_fldui.srs        \
     $(SRS)$/sw_globdoc.srs      \
     $(SRS)$/sw_index.srs        \
diff --git a/binfilter/prj/build.lst b/binfilter/prj/build.lst
index 265a8b7..c6e97dd 100644
--- a/binfilter/prj/build.lst
+++ b/binfilter/prj/build.lst
@@ -123,7 +123,6 @@ bf 	binfilter\bf_sw\source\core\bastyp                  nmake   -   all bf_sw_ba
 bf	binfilter\bf_sw\source\ui\app						nmake	-	all	bf_sw_app NULL
 bf	binfilter\bf_sw\source\ui\config					nmake	-	all	bf_sw_conf NULL
 bf	binfilter\bf_sw\source\ui\dbui						nmake	-	all	bf_sw_dbui NULL
-bf	binfilter\bf_sw\source\ui\dochdl					nmake	-	all	bf_sw_dchdl NULL
 bf	binfilter\bf_sw\source\ui\fldui						nmake	-	all	bf_sw_fldui NULL
 bf	binfilter\bf_sw\source\ui\globdoc					nmake	-	all	bf_sw_globd NULL
 bf	binfilter\bf_sw\source\ui\index						nmake	-	all	bf_sw_index NULL
@@ -160,7 +159,7 @@ bf  binfilter\bf_sw\source\filter\lotus                 nmake   -   all bf_sw_lo
 bf  binfilter\bf_sw\source\filter\excel                 nmake   -   all bf_sw_excel  NULL
 bf  binfilter\bf_sw\source\filter\w4w                   nmake   -   all bf_sw_w4w    NULL
 bf  binfilter\bf_sw\source\filter\sw6                   nmake   -   all bf_sw_sw6    NULL
-bf  binfilter\bf_sw\source\ui                           nmake   -   all bf_sw_ui bf_sw_app  bf_sw_conf bf_sw_dbui bf_sw_dchdl bf_sw_fldui bf_sw_globd bf_sw_index bf_sw_misc bf_sw_shell bf_sw_uiuno bf_sw_utlui bf_sw_web bf_sw_wrtsh NULL
+bf  binfilter\bf_sw\source\ui                           nmake   -   all bf_sw_ui bf_sw_app  bf_sw_conf bf_sw_dbui bf_sw_fldui bf_sw_globd bf_sw_index bf_sw_misc bf_sw_shell bf_sw_uiuno bf_sw_utlui bf_sw_web bf_sw_wrtsh NULL
 bf      binfilter\bf_sw\source\core                                                     nmake   -   all bf_sw_core bf_sw_attr bf_sw_bast bf_sw_crsr bf_sw_dcnd bf_sw_doc bf_sw_draw bf_sw_edit bf_sw_fld bf_sw_frmed bf_sw_grph bf_sw_layo bf_sw_ole bf_sw_para bf_sw_sw3io bf_sw_swg bf_sw_text bf_sw_tox bf_sw_txtnd bf_sw_uco bf_sw_view NULL
 bf  binfilter\bf_sw\source\filter                       nmake   -   all bf_sw_flt bf_sw_ascii bf_sw_bsflt  bf_sw_wrtr bf_sw_xml bf_sw_lotus bf_sw_excel bf_sw_w4w bf_sw_sw6 NULL
 bf  binfilter\bf_sw\util                                nmake   -   all bf_sw_util bf_sw_core bf_sw_flt bf_sw_ui bf_sd_util bf_sb_util bf_so3_util NULL


More information about the Libreoffice-commits mailing list