[Libreoffice-commits] .: 4 commits - binfilter/bf_sw
Caolán McNamara
caolan at kemper.freedesktop.org
Tue Mar 8 12:41:17 PST 2011
binfilter/bf_sw/source/ui/envelp/makefile.mk | 2
binfilter/bf_sw/source/ui/envelp/sw_envimg.cxx | 6 -
binfilter/bf_sw/source/ui/globdoc/makefile.mk | 2
binfilter/bf_sw/source/ui/index/makefile.mk | 2
binfilter/bf_sw/source/ui/index/sw_toxmgr.cxx | 1
binfilter/bf_sw/source/ui/ribbar/inputwin.hrc | 84 -----------------
binfilter/bf_sw/source/ui/ribbar/makefile.mk | 61 ------------
binfilter/bf_sw/source/ui/ribbar/sw_workctrl.src | 110 -----------------------
binfilter/bf_sw/source/ui/ribbar/tblctrl.hrc | 35 -------
binfilter/bf_sw/source/ui/ribbar/workctrl.hrc | 88 ------------------
10 files changed, 4 insertions(+), 387 deletions(-)
New commits:
commit 48d8e51ccb909e8b4c7324594c4198ca3ed51883
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Mar 8 20:30:39 2011 +0000
remove unused dir
diff --git a/binfilter/bf_sw/source/ui/ribbar/inputwin.hrc b/binfilter/bf_sw/source/ui/ribbar/inputwin.hrc
deleted file mode 100644
index e55fa18..0000000
--- a/binfilter/bf_sw/source/ui/ribbar/inputwin.hrc
+++ /dev/null
@@ -1,84 +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 _INPUTWIN_HRC
-#define _INPUTWIN_HRC
-
-
-//PopupMenu Id's
-#define MN_CALC_PHD 1
-#define MN_CALC_SQRT 2
-#define MN_CALC_OR 3
-#define MN_CALC_XOR 4
-#define MN_CALC_AND 5
-#define MN_CALC_NOT 6
-#define MN_CALC_EQ 7
-#define MN_CALC_NEQ 8
-#define MN_CALC_LEQ 9
-#define MN_CALC_GEQ 10
-#define MN_CALC_LES 11
-#define MN_CALC_GRE 12
-#define MN_CALC_SUM 13
-#define MN_CALC_MEAN 14
-#define MN_CALC_MIN 15
-#define MN_CALC_MAX 16
-#define MN_CALC_SIN 17
-#define MN_CALC_COS 18
-#define MN_CALC_TAN 19
-#define MN_CALC_ASIN 20
-#define MN_CALC_ACOS 21
-#define MN_CALC_ATAN 22
-#define MN_CALC_POW 23
-#define MN_CALC_LISTSEP 24
-#define MN_CALC_ROUND 25
-
-#define MN_POP_OPS 29
-#define MN_POP_STATISTICS 30
-#define MN_POP_FUNC 31
-#define MN_RSC_END 32
-
-#define TBX_FORMULA 1
-#define ED_POS 2
-#define ED_FORMULA 3
-
-#endif
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/binfilter/bf_sw/source/ui/ribbar/makefile.mk b/binfilter/bf_sw/source/ui/ribbar/makefile.mk
deleted file mode 100644
index d56efa3..0000000
--- a/binfilter/bf_sw/source/ui/ribbar/makefile.mk
+++ /dev/null
@@ -1,61 +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_ribbar
-
-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 --------------------------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES = \
- sw_workctrl.src
-
-SLOFILES = \
- $(SLO)$/sw_inputwin.obj \
- $(SLO)$/sw_tbxanchr.obj \
- $(SLO)$/sw_tblctrl.obj \
- $(SLO)$/sw_workctrl.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE : target.mk
-
-$(SRS)$/sw_ribbar.srs: $(PRJ)$/inc$/bf_svx$/globlmn.hrc
-
diff --git a/binfilter/bf_sw/source/ui/ribbar/sw_workctrl.src b/binfilter/bf_sw/source/ui/ribbar/sw_workctrl.src
deleted file mode 100644
index eda8ea7..0000000
--- a/binfilter/bf_sw/source/ui/ribbar/sw_workctrl.src
+++ /dev/null
@@ -1,110 +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
-
-#define SCROLL_IMAGE_IDLIST \
- IdList = \
- { \
- NID_NEXT ; \
- NID_PREV ; \
- NID_TBL ; \
- NID_FRM ; \
- NID_PGE ; \
- NID_DRW ; \
- NID_CTRL ; \
- NID_REG ; \
- NID_BKM ; \
- NID_GRF ; \
- NID_OLE ; \
- NID_OUTL ; \
- NID_SEL ; \
- NID_FTN ; \
- NID_MARK ; \
- NID_POSTIT ; \
- NID_SRCH_REP ; \
- NID_INDEX_ENTRY; \
- NID_TABLE_FORMULA; \
- NID_TABLE_FORMULA_ERROR; \
- }; \
- IdCount = { 20 ; };
-
-/*
-Noch ein paar Reserven
- ToolBoxItem
- {
- Identifier = NID_NEXT;
- Text [ de ] = "Vorwärts" ;
- };
- ToolBoxItem
- {
- Identifier = NID_PREV;
- Text [ de ] = "Rückwärts" ;
- };
- ToolBoxItem
- {
- Identifier = NID_CTRL;
- Text [ de ] = "Control" ;
- };
- ToolBoxItem
- {
- Identifier = NID_DRW;
- Text [ de ] = "Zeichenobjekt" ;
- };
-
-
-*/
-/***************************************************************
- Strings fuer die Quickhelp der View-PgUp/Down-Buttons
-***************************************************************/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/binfilter/bf_sw/source/ui/ribbar/tblctrl.hrc b/binfilter/bf_sw/source/ui/ribbar/tblctrl.hrc
deleted file mode 100644
index fcc31d4..0000000
--- a/binfilter/bf_sw/source/ui/ribbar/tblctrl.hrc
+++ /dev/null
@@ -1,35 +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 _TBLCTRL_HRC
-#define _TBLCTRL_HRC
-#include "ribbar.hrc"
-
-#define TBX_OPTIMIZE_TABLE 1
-
-#endif
-
-
diff --git a/binfilter/bf_sw/source/ui/ribbar/workctrl.hrc b/binfilter/bf_sw/source/ui/ribbar/workctrl.hrc
deleted file mode 100644
index 108cf44..0000000
--- a/binfilter/bf_sw/source/ui/ribbar/workctrl.hrc
+++ /dev/null
@@ -1,88 +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 _WORKCTRL_HRC
-#define _WORKCTRL_HRC
-#include "ribbar.hrc"
-
-#define TBX_INSERT 1
-#define TBX_OBJ_INSERT 2
-#define TBX_FIELD_INSERT 3
-#define TBX_NAVIGATION 4
-#define IL_VALUES 5
-#define IMG_BTN 6
-#define ST_QUICK 7
-#define FI_INFO 8
-#define FL_SEP 9
-#define ILH_VALUES 10
-#define IMG_BTN_H 11
-
-
-#define ST_TBL 12
-#define ST_FRM 13
-#define ST_PGE 14
-#define ST_DRW 15
-#define ST_CTRL 16
-#define ST_REG 17
-#define ST_BKM 18
-#define ST_GRF 19
-#define ST_OLE 20
-#define ST_OUTL 21
-#define ST_SEL 22
-#define ST_FTN 23
-#define ST_MARK 24
-#define ST_POSTIT 25
-#define ST_SRCH_REP 26
-#define ST_INDEX_ENTRY 27
-#define ST_TABLE_FORMULA 28
-#define ST_TABLE_FORMULA_ERROR 29
-
-// doppelter Eintrag! hrc und hxx
-// diese Ids bestimmen, was die Buttons unter dem Scrollbar tun
-#define NID_START 20000
-#define NID_NEXT 20000
-#define NID_PREV 20001
-#define NID_TBL 20002
-#define NID_FRM 20003
-#define NID_PGE 20004
-#define NID_DRW 20005
-#define NID_CTRL 20006
-#define NID_REG 20007
-#define NID_BKM 20008
-#define NID_GRF 20009
-#define NID_OLE 20010
-#define NID_OUTL 20011
-#define NID_SEL 20012
-#define NID_FTN 20013
-#define NID_MARK 20014
-#define NID_POSTIT 20015
-#define NID_SRCH_REP 20016
-#define NID_INDEX_ENTRY 20017
-#define NID_TABLE_FORMULA 20018
-#define NID_TABLE_FORMULA_ERROR 20019
-#define NID_COUNT 20
-
-#endif
commit d347ac218f8e4c2c371956611cc986e22a561580
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Mar 8 20:29:03 2011 +0000
WaE: mark this dir as warnings free
diff --git a/binfilter/bf_sw/source/ui/globdoc/makefile.mk b/binfilter/bf_sw/source/ui/globdoc/makefile.mk
index cefea52..b652ced 100644
--- a/binfilter/bf_sw/source/ui/globdoc/makefile.mk
+++ b/binfilter/bf_sw/source/ui/globdoc/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..$/..$/..
BFPRJ=..$/..$/..
commit d294a69412b71066281c2bdd8c9f6e0f69c895bb
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Mar 8 20:28:30 2011 +0000
WaE: mark this dir as warnings free
diff --git a/binfilter/bf_sw/source/ui/index/makefile.mk b/binfilter/bf_sw/source/ui/index/makefile.mk
index be71a24..7ba4040 100644
--- a/binfilter/bf_sw/source/ui/index/makefile.mk
+++ b/binfilter/bf_sw/source/ui/index/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..$/..$/..
BFPRJ=..$/..$/..
diff --git a/binfilter/bf_sw/source/ui/index/sw_toxmgr.cxx b/binfilter/bf_sw/source/ui/index/sw_toxmgr.cxx
index 7aa0a60..dc51fbd 100644
--- a/binfilter/bf_sw/source/ui/index/sw_toxmgr.cxx
+++ b/binfilter/bf_sw/source/ui/index/sw_toxmgr.cxx
@@ -46,6 +46,7 @@ namespace binfilter {
/*N*/ ShellResource* pShellRes = ViewShell::GetShellRes();
/*N*/ switch(eType)
/*N*/ {
+/*N*/ default:
/*N*/ case TOX_CONTENT : pRet = &pShellRes->aTOXContentName; break;
/*N*/ case TOX_INDEX : pRet = &pShellRes->aTOXIndexName; break;
/*?*/ case TOX_USER : pRet = &pShellRes->aTOXUserName; break;
commit 336bc58aeec4e9f97eeaad238290e2a420d8d116
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Mar 8 20:22:09 2011 +0000
WaE: mark this dir as warnings free
diff --git a/binfilter/bf_sw/source/ui/envelp/makefile.mk b/binfilter/bf_sw/source/ui/envelp/makefile.mk
index 0ccee51..78fac5a 100644
--- a/binfilter/bf_sw/source/ui/envelp/makefile.mk
+++ b/binfilter/bf_sw/source/ui/envelp/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..$/..$/..
BFPRJ=..$/..$/..
diff --git a/binfilter/bf_sw/source/ui/envelp/sw_envimg.cxx b/binfilter/bf_sw/source/ui/envelp/sw_envimg.cxx
index 5dad526..b18a453 100644
--- a/binfilter/bf_sw/source/ui/envelp/sw_envimg.cxx
+++ b/binfilter/bf_sw/source/ui/envelp/sw_envimg.cxx
@@ -62,10 +62,10 @@ using ::rtl::OUString;
/*N*/ aAddrText (rItem.aAddrText),
/*N*/ bSend (rItem.bSend),
/*N*/ aSendText (rItem.aSendText),
-/*N*/ lSendFromLeft (rItem.lSendFromLeft),
-/*N*/ lSendFromTop (rItem.lSendFromTop),
/*N*/ lAddrFromLeft (rItem.lAddrFromLeft),
/*N*/ lAddrFromTop (rItem.lAddrFromTop),
+/*N*/ lSendFromLeft (rItem.lSendFromLeft),
+/*N*/ lSendFromTop (rItem.lSendFromTop),
/*N*/ lWidth (rItem.lWidth),
/*N*/ lHeight (rItem.lHeight),
/*N*/ eAlign (rItem.eAlign),
@@ -76,7 +76,7 @@ using ::rtl::OUString;
/*N*/ }
// --------------------------------------------------------------------------
-/*N*/ int SwEnvItem::operator ==(const SfxPoolItem& rItem) const
+/*N*/ int SwEnvItem::operator ==(const SfxPoolItem&) const
/*N*/ {
DBG_BF_ASSERT(0, "STRIP"); return 0;
/*N*/ }
More information about the Libreoffice-commits
mailing list