[Libreoffice-commits] .: 11 commits - basic/inc basic/source dbaccess/inc dbaccess/source desktop/source editeng/inc editeng/source filter/source Makefile.in padmin/source sc/inc sc/qa sc/source starmath/inc svx/inc svx/source svx/workben sw/inc sw/source tools/qa unusedcode.easy vcl/inc vcl/source xmloff/inc xmloff/source
Caolán McNamara
caolan at kemper.freedesktop.org
Thu Sep 29 01:35:42 PDT 2011
Makefile.in | 1
basic/inc/basic/sbmeth.hxx | 1
basic/source/classes/sbxmod.cxx | 8
dbaccess/inc/dbaundomanager.hxx | 3
dbaccess/inc/pch/precompiled_dbaxml.cxx | 2
dbaccess/inc/pch/precompiled_dbaxml.hxx | 2
dbaccess/inc/pch/precompiled_dbmm.cxx | 2
dbaccess/inc/pch/precompiled_dbmm.hxx | 2
dbaccess/inc/pch/precompiled_dbui.cxx | 2
dbaccess/inc/pch/precompiled_dbui.hxx | 2
dbaccess/source/ui/app/closeveto.cxx | 3
dbaccess/source/ui/app/closeveto.hxx | 3
dbaccess/source/ui/dlg/dbfindex.hxx | 2
dbaccess/source/ui/inc/singledoccontroller.hxx | 3
dbaccess/source/ui/misc/dbaundomanager.cxx | 3
dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx | 2
desktop/source/app/officeipcthread.cxx | 29 +--
editeng/inc/editeng/outliner.hxx | 20 --
editeng/source/outliner/outlvw.cxx | 174 -------------------
filter/source/graphicfilter/idxf/dxfgrprd.cxx | 43 +---
padmin/source/helper.hxx | 2
padmin/source/padialog.hxx | 4
sc/inc/clipdata.hxx | 3
sc/inc/dragdata.hxx | 3
sc/inc/globalnames.hxx | 3
sc/inc/helpids.h | 3
sc/inc/orcus/css_parser.hpp | 3
sc/inc/orcus/csv_parser.hpp | 3
sc/inc/sccommands.h | 3
sc/inc/stlalgorithm.hxx | 3
sc/inc/subtotalparam.hxx | 3
sc/inc/undorangename.hxx | 3
sc/qa/unit/helper/csv_handler.hxx | 2
sc/source/core/data/subtotalparam.cxx | 3
sc/source/filter/ftools/fapihelper.cxx | 13 -
sc/source/ui/cctrl/checklistmenu.cxx | 3
sc/source/ui/inc/checklistmenu.hxx | 3
sc/source/ui/inc/cliputil.hxx | 3
sc/source/ui/undo/undorangename.cxx | 2
sc/source/ui/view/cliputil.cxx | 3
starmath/inc/helpids.h | 2
starmath/inc/smcommands.h | 3
svx/inc/svx/databaseregistrationui.hxx | 3
svx/inc/svx/fmobjfac.hxx | 2
svx/inc/svx/hyprlink.hxx | 2
svx/inc/svx/svxcommands.h | 3
svx/inc/svx/tbxcolor.hxx | 2
svx/inc/svx/zoom_def.hxx | 3
svx/source/dialog/_bmpmask.cxx | 11 -
svx/source/dialog/hyprdlg.hxx | 2
svx/source/inc/fmgroup.hxx | 2
svx/workben/edittest.cxx | 3
sw/inc/IShellCursorSupplier.hxx | 3
sw/inc/swcommands.h | 3
sw/inc/switerator.hxx | 3
sw/source/core/docnode/nodedump.cxx | 3
sw/source/core/inc/UndoAttribute.hxx | 2
sw/source/core/inc/UndoBookmark.hxx | 2
sw/source/core/inc/UndoCore.hxx | 2
sw/source/core/inc/UndoDelete.hxx | 2
sw/source/core/inc/UndoDraw.hxx | 2
sw/source/core/inc/UndoInsert.hxx | 2
sw/source/core/inc/UndoManager.hxx | 2
sw/source/core/inc/UndoNumbering.hxx | 2
sw/source/core/inc/UndoOverwrite.hxx | 2
sw/source/core/inc/UndoRedline.hxx | 2
sw/source/core/inc/UndoSection.hxx | 2
sw/source/core/inc/UndoSort.hxx | 2
sw/source/core/inc/UndoSplitMove.hxx | 2
sw/source/core/inc/UndoTable.hxx | 2
sw/source/core/inc/attrhint.hxx | 3
sw/source/core/inc/fieldhint.hxx | 3
sw/source/core/inc/pagedeschint.hxx | 3
sw/source/filter/html/css1atr.cxx | 4
sw/source/filter/html/htmlatr.cxx | 2
tools/qa/cppunit/test_reversemap.cxx | 1
unusedcode.easy | 5
vcl/inc/vcl/event.hxx | 3
vcl/source/window/mouseevent.cxx | 27 --
xmloff/inc/MultiPropertySetHelper.hxx | 2
xmloff/source/style/MultiPropertySetHelper.cxx | 20 --
81 files changed, 199 insertions(+), 327 deletions(-)
New commits:
commit 5b9a34807f72340b537134eed489f4d2b4942197
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Sep 29 09:33:14 2011 +0100
stray fprintf
diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx
index 0b5f236..def82b4 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -1490,7 +1490,6 @@ void VCLXWindow::setProperty( const ::rtl::OUString& PropertyName, const ::com::
case MouseWheelBehavior::SCROLL_FOCUS_ONLY: nVclBehavior = MOUSE_WHEEL_FOCUS_ONLY; break;
case MouseWheelBehavior::SCROLL_ALWAYS: nVclBehavior = MOUSE_WHEEL_ALWAYS; break;
default:
- fprintf(stderr, "nVclBehavior is %d\n", nWheelBehavior);
OSL_FAIL( "VCLXWindow::setProperty( 'MouseWheelBehavior' ): illegal property value!" );
}
commit 91f436f58afbc3d46c24c6dc2f1d7ab1e1559d81
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Sep 29 09:22:13 2011 +0100
we're not using this header here
diff --git a/tools/qa/cppunit/test_reversemap.cxx b/tools/qa/cppunit/test_reversemap.cxx
index 1f85c7b..c2a6798 100644
--- a/tools/qa/cppunit/test_reversemap.cxx
+++ b/tools/qa/cppunit/test_reversemap.cxx
@@ -41,7 +41,6 @@
#include <rtl/ustring.hxx>
#include <vector>
-#include "unotest/oustringostreaminserter.hxx"
#include "tools/tenccvt.hxx"
//Tests for getBestMSEncodingByChar
commit 754c5d5cc78d53d55c12243ea4d42dc5c34995c7
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Sep 28 23:47:40 2011 +0100
mkdir -p
diff --git a/Makefile.in b/Makefile.in
index 99d9af1..ec38633 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -132,6 +132,7 @@ findunusedcode:
@which callcatcher > /dev/null 2>&1 || \
(echo "callcatcher not installed" && false)
@. ./Env.Host.sh && \
+ mkdir -p $$SRC_ROOT/solenv/callcatcher/bin && \
ln -sf $$SRC_ROOT/solenv/$$INPATH/bin/dmake \
$$SRC_ROOT/solenv/callcatcher/bin/dmake && \
source <(sed -e s,$$INPATH,callcatcher,g ./Env.Host.sh) && \
commit a336daff85341746591d0458b9eb2b727be762ab
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Sep 28 23:33:11 2011 +0100
ByteString->rtl::OString
diff --git a/sc/source/filter/ftools/fapihelper.cxx b/sc/source/filter/ftools/fapihelper.cxx
index 82c720e..97770ce 100644
--- a/sc/source/filter/ftools/fapihelper.cxx
+++ b/sc/source/filter/ftools/fapihelper.cxx
@@ -38,6 +38,7 @@
#include <comphelper/docpasswordhelper.hxx>
#include <comphelper/processfactory.hxx>
#include <tools/urlobj.hxx>
+#include <rtl/strbuf.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/docfile.hxx>
#include <sfx2/request.hxx>
@@ -280,13 +281,13 @@ void ScfPropertySet::SetAnyProperty( const OUString& rPropName, const Any& rValu
if( mxPropSet.is() )
mxPropSet->setPropertyValue( rPropName, rValue );
}
- catch( Exception& )
+ catch (const Exception&)
{
- OSL_FAIL(
- ByteString( "ScfPropertySet::SetAnyProperty - cannot set property \"" ).
- Append( ByteString( String( rPropName ), RTL_TEXTENCODING_ASCII_US ) ).
- Append( '"' ).
- GetBuffer() );
+ OSL_FAIL(rtl::OStringBuffer(RTL_CONSTASCII_STRINGPARAM(
+ "ScfPropertySet::SetAnyProperty - cannot set property \""))
+ .append(rtl::OUStringToOString(rPropName,
+ RTL_TEXTENCODING_ASCII_US))
+ .append('"').getStr());
}
}
commit 2774cab826c8b5e3a92e98d79c3e64cbb25f4fda
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Sep 28 23:14:11 2011 +0100
add modelines
diff --git a/dbaccess/inc/dbaundomanager.hxx b/dbaccess/inc/dbaundomanager.hxx
index 1b8627f..c87a900 100644
--- a/dbaccess/inc/dbaundomanager.hxx
+++ b/dbaccess/inc/dbaundomanager.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -101,3 +102,5 @@ namespace dbaui
//......................................................................................................................
#endif // DBACCESS_DBAUNDOMANAGER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/inc/pch/precompiled_dbaxml.cxx b/dbaccess/inc/pch/precompiled_dbaxml.cxx
index 2e555ef..0d200e5 100644
--- a/dbaccess/inc/pch/precompiled_dbaxml.cxx
+++ b/dbaccess/inc/pch/precompiled_dbaxml.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,3 +28,4 @@
#include "precompiled_dbaxml.hxx"
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/inc/pch/precompiled_dbaxml.hxx b/dbaccess/inc/pch/precompiled_dbaxml.hxx
index 099adaf..76707f7 100644
--- a/dbaccess/inc/pch/precompiled_dbaxml.hxx
+++ b/dbaccess/inc/pch/precompiled_dbaxml.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -518,3 +519,4 @@
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/inc/pch/precompiled_dbmm.cxx b/dbaccess/inc/pch/precompiled_dbmm.cxx
index ff6a557..ca0567d 100644
--- a/dbaccess/inc/pch/precompiled_dbmm.cxx
+++ b/dbaccess/inc/pch/precompiled_dbmm.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,3 +28,4 @@
#include "precompiled_dbmm.hxx"
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/inc/pch/precompiled_dbmm.hxx b/dbaccess/inc/pch/precompiled_dbmm.hxx
index 099adaf..76707f7 100644
--- a/dbaccess/inc/pch/precompiled_dbmm.hxx
+++ b/dbaccess/inc/pch/precompiled_dbmm.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -518,3 +519,4 @@
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/inc/pch/precompiled_dbui.cxx b/dbaccess/inc/pch/precompiled_dbui.cxx
index dbed0b6..b5bb959 100644
--- a/dbaccess/inc/pch/precompiled_dbui.cxx
+++ b/dbaccess/inc/pch/precompiled_dbui.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,3 +28,4 @@
#include "precompiled_dbui.hxx"
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/inc/pch/precompiled_dbui.hxx b/dbaccess/inc/pch/precompiled_dbui.hxx
index 1166288..3ab80e8 100644
--- a/dbaccess/inc/pch/precompiled_dbui.hxx
+++ b/dbaccess/inc/pch/precompiled_dbui.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -521,3 +522,4 @@
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/app/closeveto.cxx b/dbaccess/source/ui/app/closeveto.cxx
index 558df26..588bdae 100644
--- a/dbaccess/source/ui/app/closeveto.cxx
+++ b/dbaccess/source/ui/app/closeveto.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -178,3 +179,5 @@ namespace dbaui
//......................................................................................................................
} // namespace dbaui
//......................................................................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/app/closeveto.hxx b/dbaccess/source/ui/app/closeveto.hxx
index f7e1c83..a9f1d6b 100644
--- a/dbaccess/source/ui/app/closeveto.hxx
+++ b/dbaccess/source/ui/app/closeveto.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -65,3 +66,5 @@ namespace dbaui
//......................................................................................................................
#endif // DBACCESS_CLOSEVETO_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/singledoccontroller.hxx b/dbaccess/source/ui/inc/singledoccontroller.hxx
index c738bd9..f896d13 100644
--- a/dbaccess/source/ui/inc/singledoccontroller.hxx
+++ b/dbaccess/source/ui/inc/singledoccontroller.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -91,3 +92,5 @@ namespace dbaui
//......................................................................................................................
#endif // DBAUI_SINGLEDOCCONTROLLER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/misc/dbaundomanager.cxx b/dbaccess/source/ui/misc/dbaundomanager.cxx
index 83f55e0..5c3f806 100644
--- a/dbaccess/source/ui/misc/dbaundomanager.cxx
+++ b/dbaccess/source/ui/misc/dbaundomanager.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -392,3 +393,5 @@ namespace dbaui
//......................................................................................................................
} // namespace dbaui
//......................................................................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
index 2ae1011..592a9ad 100644
--- a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
+++ b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -670,3 +671,4 @@ namespace dbaui
} // namespace dbaui
//........................................................................
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/clipdata.hxx b/sc/inc/clipdata.hxx
index 823e398..2e8567a 100644
--- a/sc/inc/clipdata.hxx
+++ b/sc/inc/clipdata.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* Version: MPL 1.1 / GPLv3+ / LGPLv3+
*
@@ -35,3 +36,5 @@ struct ScClipData
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/dragdata.hxx b/sc/inc/dragdata.hxx
index f192c3f..76232cb 100644
--- a/sc/inc/dragdata.hxx
+++ b/sc/inc/dragdata.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* Version: MPL 1.1 / GPLv3+ / LGPLv3+
*
@@ -48,3 +49,5 @@ struct ScDragData
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/globalnames.hxx b/sc/inc/globalnames.hxx
index ae30bc1..a36fa5b 100644
--- a/sc/inc/globalnames.hxx
+++ b/sc/inc/globalnames.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* Version: MPL 1.1 / GPLv3+ / LGPLv3+
*
@@ -32,3 +33,5 @@
#define STR_DB_GLOBAL_NONAME "__Anonymous_DB__"
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index 5546cf8..ec756ae 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -697,3 +698,5 @@
#define HID_FUNC_BITXOR "SC_HID_FUNC_BITXOR"
#define HID_FUNC_BITLSHIFT "SC_HID_FUNC_BITLSHIFT"
#define HID_FUNC_BITRSHIFT "SC_HID_FUNC_BITRSHIFT"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/orcus/css_parser.hpp b/sc/inc/orcus/css_parser.hpp
index c211cca..17aef45 100644
--- a/sc/inc/orcus/css_parser.hpp
+++ b/sc/inc/orcus/css_parser.hpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* Copyright (c) 2011 Kohei Yoshida
@@ -520,3 +521,5 @@ char css_parser<_Handler>::cur_char() const
}
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/orcus/csv_parser.hpp b/sc/inc/orcus/csv_parser.hpp
index c5adc17..cc23374 100644
--- a/sc/inc/orcus/csv_parser.hpp
+++ b/sc/inc/orcus/csv_parser.hpp
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* Copyright (c) 2011 Kohei Yoshida
@@ -292,3 +293,5 @@ void csv_parser<_Handler>::push_cell_value(const char* p, size_t n)
}
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/sccommands.h b/sc/inc/sccommands.h
index 98c2615..e65dad7 100644
--- a/sc/inc/sccommands.h
+++ b/sc/inc/sccommands.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -334,3 +335,5 @@
#define CMD_FID_TAB_SET_TAB_BG_COLOR ".uno:TabBgColor"
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/stlalgorithm.hxx b/sc/inc/stlalgorithm.hxx
index a3a02f9..c6e3773 100644
--- a/sc/inc/stlalgorithm.hxx
+++ b/sc/inc/stlalgorithm.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* Version: MPL 1.1 / GPLv3+ / LGPLv3+
*
@@ -44,3 +45,5 @@ struct ScDeleteObjectByPtr : public ::std::unary_function<T*, void>
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/subtotalparam.hxx b/sc/inc/subtotalparam.hxx
index 9e64c29..65a48a2 100644
--- a/sc/inc/subtotalparam.hxx
+++ b/sc/inc/subtotalparam.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* Version: MPL 1.1 / GPLv3+ / LGPLv3+
*
@@ -65,3 +66,5 @@ struct SC_DLLPUBLIC ScSubTotalParam
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/undorangename.hxx b/sc/inc/undorangename.hxx
index 7a50f82..131a404 100644
--- a/sc/inc/undorangename.hxx
+++ b/sc/inc/undorangename.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* Version: MPL 1.1 / GPLv3+ / LGPLv3+
*
@@ -64,3 +65,5 @@ private:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/qa/unit/helper/csv_handler.hxx b/sc/qa/unit/helper/csv_handler.hxx
index 417e930..dce26e6 100644
--- a/sc/qa/unit/helper/csv_handler.hxx
+++ b/sc/qa/unit/helper/csv_handler.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* Version: MPL 1.1 / GPLv3+ / LGPLv3+
*
@@ -195,3 +196,4 @@ private:
SCTAB mnTab;
};
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/data/subtotalparam.cxx b/sc/source/core/data/subtotalparam.cxx
index aaf55ec..6f57258 100644
--- a/sc/source/core/data/subtotalparam.cxx
+++ b/sc/source/core/data/subtotalparam.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* Version: MPL 1.1 / GPLv3+ / LGPLv3+
*
@@ -230,3 +231,5 @@ void ScSubTotalParam::SetSubTotals( sal_uInt16 nGroup,
}
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx
index 76b75c0..63a0f30 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* Version: MPL 1.1 / GPLv3+ / LGPLv3+
*
@@ -1195,3 +1196,5 @@ void ScCheckListMenuWindow::setOKAction(Action* p)
{
mpOKAction.reset(p);
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx
index bd2914b..4c96c2f 100644
--- a/sc/source/ui/inc/checklistmenu.hxx
+++ b/sc/source/ui/inc/checklistmenu.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* Version: MPL 1.1 / GPLv3+ / LGPLv3+
*
@@ -307,3 +308,5 @@ private:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/cliputil.hxx b/sc/source/ui/inc/cliputil.hxx
index f5ddc47..afebd66 100644
--- a/sc/source/ui/inc/cliputil.hxx
+++ b/sc/source/ui/inc/cliputil.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* Version: MPL 1.1 / GPLv3+ / LGPLv3+
*
@@ -49,3 +50,5 @@ public:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/undo/undorangename.cxx b/sc/source/ui/undo/undorangename.cxx
index 5bbcd0b..a3ba960 100644
--- a/sc/source/ui/undo/undorangename.cxx
+++ b/sc/source/ui/undo/undorangename.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* Version: MPL 1.1 / GPLv3+ / LGPLv3+
*
@@ -119,3 +120,4 @@ void ScUndoAllRangeNames::DoChange(const ScRangeName& rGlobal, const ScRangeName
SFX_APP()->Broadcast(SfxSimpleHint(SC_HINT_AREAS_CHANGED));
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/view/cliputil.cxx b/sc/source/ui/view/cliputil.cxx
index 620b9c0..bd8be80 100644
--- a/sc/source/ui/view/cliputil.cxx
+++ b/sc/source/ui/view/cliputil.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* Version: MPL 1.1 / GPLv3+ / LGPLv3+
*
@@ -120,3 +121,5 @@ bool ScClipUtil::CheckDestRanges(
}
return true;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/inc/helpids.h b/starmath/inc/helpids.h
index 1da4029..cac2b64 100644
--- a/starmath/inc/helpids.h
+++ b/starmath/inc/helpids.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -325,3 +326,4 @@
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/inc/smcommands.h b/starmath/inc/smcommands.h
index d2f08c5..b13263a 100644
--- a/starmath/inc/smcommands.h
+++ b/starmath/inc/smcommands.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -66,3 +67,5 @@
#define CMD_SID_ZOOMOUT ".uno:ZoomOut"
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/databaseregistrationui.hxx b/svx/inc/svx/databaseregistrationui.hxx
index d168ed5..0af5c9b 100644
--- a/svx/inc/svx/databaseregistrationui.hxx
+++ b/svx/inc/svx/databaseregistrationui.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -51,3 +52,5 @@ namespace svx
//........................................................................
#endif // SVX_DATABASE_REGISTRATION_UI_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/fmobjfac.hxx b/svx/inc/svx/fmobjfac.hxx
index 7d10ea2..60edaa8 100644
--- a/svx/inc/svx/fmobjfac.hxx
+++ b/svx/inc/svx/fmobjfac.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -49,3 +50,4 @@ public:
#endif // _FM_FMOBJFAC_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/hyprlink.hxx b/svx/inc/svx/hyprlink.hxx
index bb869f5..0561966 100644
--- a/svx/inc/svx/hyprlink.hxx
+++ b/svx/inc/svx/hyprlink.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -41,3 +42,4 @@ public:
#endif // _SVX_DLG_HYPERLINK_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/svxcommands.h b/svx/inc/svx/svxcommands.h
old mode 100755
new mode 100644
index 01ff0bc..f23c74f
--- a/svx/inc/svx/svxcommands.h
+++ b/svx/inc/svx/svxcommands.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -602,3 +603,5 @@
#define CMD_SID_TABLE_INSERT_ROW_DLG ".uno:InsertRowDialog"
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/tbxcolor.hxx b/svx/inc/svx/tbxcolor.hxx
index 848c015..cbd5bb4 100644
--- a/svx/inc/svx/tbxcolor.hxx
+++ b/svx/inc/svx/tbxcolor.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -69,3 +70,4 @@ namespace svx
#endif // #ifndef _SVX_TBXCOLOR_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/zoom_def.hxx b/svx/inc/svx/zoom_def.hxx
index 24b1c86..0a24476 100644
--- a/svx/inc/svx/zoom_def.hxx
+++ b/svx/inc/svx/zoom_def.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
#ifndef _SVX_ZOOM_DEF_HXX
#define _SVX_ZOOM_DEF_HXX
@@ -6,3 +7,5 @@
#define ZOOMBTN_WHOLEPAGE ((sal_uInt16)0x0004)
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/hyprdlg.hxx b/svx/source/dialog/hyprdlg.hxx
index d29a4f5..8311e90 100644
--- a/svx/source/dialog/hyprdlg.hxx
+++ b/svx/source/dialog/hyprdlg.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -141,3 +142,4 @@ public:
#endif // _SVX_DLG_HYPERDLG_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/inc/fmgroup.hxx b/svx/source/inc/fmgroup.hxx
index 800cafb..2a4af9e 100644
--- a/svx/source/inc/fmgroup.hxx
+++ b/svx/source/inc/fmgroup.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -116,3 +117,4 @@ protected:
#endif // _SVX_FMGROUP_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/workben/edittest.cxx b/svx/workben/edittest.cxx
index fc0da68..effe592 100644
--- a/svx/workben/edittest.cxx
+++ b/svx/workben/edittest.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -1750,3 +1751,5 @@ void __EXPORT EditApp::Main()
}
EditApp aEditApp;
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/IShellCursorSupplier.hxx b/sw/inc/IShellCursorSupplier.hxx
index a160f43..0f7ee62 100644
--- a/sw/inc/IShellCursorSupplier.hxx
+++ b/sw/inc/IShellCursorSupplier.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -49,3 +50,5 @@ public:
} // namespace sw
#endif // ISHELLCURSORSUPPLIER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/swcommands.h b/sw/inc/swcommands.h
index 20f19fc..db82b64 100644
--- a/sw/inc/swcommands.h
+++ b/sw/inc/swcommands.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -440,3 +441,5 @@
#define CMD_FN_PAGEBREAK_DELETE ".uno:PageBreakDelete"
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/switerator.hxx b/sw/inc/switerator.hxx
index fb0523c..88b0e7e 100644
--- a/sw/inc/switerator.hxx
+++ b/sw/inc/switerator.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -45,3 +46,5 @@ public:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/docnode/nodedump.cxx b/sw/source/core/docnode/nodedump.cxx
index 17d6c87..f5b85dc 100644
--- a/sw/source/core/docnode/nodedump.cxx
+++ b/sw/source/core/docnode/nodedump.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* Version: MPL 1.1 / GPLv3+ / LGPLv3+
*
@@ -197,3 +198,5 @@ void SwTxtNode::dumpAsXml( xmlTextWriterPtr w )
}
#endif // OSL_DEBUG_LEVEL
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/UndoAttribute.hxx b/sw/source/core/inc/UndoAttribute.hxx
index 2ad17e4..9a5541c 100644
--- a/sw/source/core/inc/UndoAttribute.hxx
+++ b/sw/source/core/inc/UndoAttribute.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -299,3 +300,4 @@ public:
#endif // SW_UNDO_ATTRIBUTE_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/UndoBookmark.hxx b/sw/source/core/inc/UndoBookmark.hxx
index 6ae6111..e1578f3 100644
--- a/sw/source/core/inc/UndoBookmark.hxx
+++ b/sw/source/core/inc/UndoBookmark.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -80,3 +81,4 @@ public:
#endif // SW_UNDO_BOOKMARK_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/UndoCore.hxx b/sw/source/core/inc/UndoCore.hxx
index e8fda05..5c08c87 100644
--- a/sw/source/core/inc/UndoCore.hxx
+++ b/sw/source/core/inc/UndoCore.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -253,3 +254,4 @@ String DenoteSpecialCharacters(const String & rStr);
#endif // SW_UNDOCORE_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/UndoDelete.hxx b/sw/source/core/inc/UndoDelete.hxx
index 20caa88..8efa5aa 100644
--- a/sw/source/core/inc/UndoDelete.hxx
+++ b/sw/source/core/inc/UndoDelete.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -111,3 +112,4 @@ public:
#endif // SW_UNDO_DELETE_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/UndoDraw.hxx b/sw/source/core/inc/UndoDraw.hxx
index a62b784..0926dab 100644
--- a/sw/source/core/inc/UndoDraw.hxx
+++ b/sw/source/core/inc/UndoDraw.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -142,3 +143,4 @@ public:
#endif // SW_UNDO_DRAW_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/UndoInsert.hxx b/sw/source/core/inc/UndoInsert.hxx
index 5995af2..6fc868e 100644
--- a/sw/source/core/inc/UndoInsert.hxx
+++ b/sw/source/core/inc/UndoInsert.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -228,3 +229,4 @@ public:
#endif // SW_UNDO_INSERT_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/UndoManager.hxx b/sw/source/core/inc/UndoManager.hxx
index 0f734d1..51f52d9 100644
--- a/sw/source/core/inc/UndoManager.hxx
+++ b/sw/source/core/inc/UndoManager.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -122,3 +123,4 @@ private:
#endif // SW_UNDO_MANAGER_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/UndoNumbering.hxx b/sw/source/core/inc/UndoNumbering.hxx
index 3d92ff7..a8731ed 100644
--- a/sw/source/core/inc/UndoNumbering.hxx
+++ b/sw/source/core/inc/UndoNumbering.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -148,3 +149,4 @@ public:
#endif // SW_UNDO_NUMBERING_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/UndoOverwrite.hxx b/sw/source/core/inc/UndoOverwrite.hxx
index 0c56d52..e1c7d19 100644
--- a/sw/source/core/inc/UndoOverwrite.hxx
+++ b/sw/source/core/inc/UndoOverwrite.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -102,3 +103,4 @@ public:
#endif // SW_UNDO_OVERWRITE_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/UndoRedline.hxx b/sw/source/core/inc/UndoRedline.hxx
index 57b0df0..8935b12 100644
--- a/sw/source/core/inc/UndoRedline.hxx
+++ b/sw/source/core/inc/UndoRedline.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -143,3 +144,4 @@ public:
#endif // SW_UNDO_REDLINE_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/UndoSection.hxx b/sw/source/core/inc/UndoSection.hxx
index bc6c8dd..c994644 100644
--- a/sw/source/core/inc/UndoSection.hxx
+++ b/sw/source/core/inc/UndoSection.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -80,3 +81,4 @@ SW_DLLPRIVATE SwUndo * MakeUndoUpdateSection(SwSectionFmt const&, bool const);
#endif // SW_UNDO_SECTION_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/UndoSort.hxx b/sw/source/core/inc/UndoSort.hxx
index b1cab72..e40bc53 100644
--- a/sw/source/core/inc/UndoSort.hxx
+++ b/sw/source/core/inc/UndoSort.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -95,3 +96,4 @@ public:
#endif // SW_UNDO_SORT_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/UndoSplitMove.hxx b/sw/source/core/inc/UndoSplitMove.hxx
index f58e715..c1a690b 100644
--- a/sw/source/core/inc/UndoSplitMove.hxx
+++ b/sw/source/core/inc/UndoSplitMove.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -94,3 +95,4 @@ public:
#endif // SW_UNDO_MOVE_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/UndoTable.hxx b/sw/source/core/inc/UndoTable.hxx
index b74b0ed..3f14ca4 100644
--- a/sw/source/core/inc/UndoTable.hxx
+++ b/sw/source/core/inc/UndoTable.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -389,3 +390,4 @@ public:
#endif // SW_UNDO_TABLE_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/attrhint.hxx b/sw/source/core/inc/attrhint.hxx
index da2ed16..a2c7b2f 100644
--- a/sw/source/core/inc/attrhint.hxx
+++ b/sw/source/core/inc/attrhint.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -42,3 +43,5 @@ public:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/fieldhint.hxx b/sw/source/core/inc/fieldhint.hxx
index 82955be..210cc74 100644
--- a/sw/source/core/inc/fieldhint.hxx
+++ b/sw/source/core/inc/fieldhint.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -42,3 +43,5 @@ public:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/pagedeschint.hxx b/sw/source/core/inc/pagedeschint.hxx
index b18ed39..68cf9bf 100644
--- a/sw/source/core/inc/pagedeschint.hxx
+++ b/sw/source/core/inc/pagedeschint.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -44,3 +45,5 @@ public:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 44eb2b3355e0846a5acba0f503d7c0b3e1c94949
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Sep 28 23:10:04 2011 +0100
remove archaic header guards
diff --git a/dbaccess/source/ui/dlg/dbfindex.hxx b/dbaccess/source/ui/dlg/dbfindex.hxx
index c10b236..2e49570 100644
--- a/dbaccess/source/ui/dlg/dbfindex.hxx
+++ b/dbaccess/source/ui/dlg/dbfindex.hxx
@@ -34,9 +34,7 @@
#include <vcl/combobox.hxx>
#include <vcl/lstbox.hxx>
#include <vcl/fixed.hxx>
-#ifndef __SGI_STL_LIST
#include <list>
-#endif
#include <comphelper/stl_types.hxx>
//.........................................................................
diff --git a/padmin/source/helper.hxx b/padmin/source/helper.hxx
index 14cee58..6fa763d 100644
--- a/padmin/source/helper.hxx
+++ b/padmin/source/helper.hxx
@@ -29,9 +29,7 @@
#ifndef _PAD_HELPER_HXX_
#define _PAD_HELPER_HXX_
-#ifndef __SGI_STL_LIST
#include <list>
-#endif
#include <tools/string.hxx>
#include <tools/resid.hxx>
#include <vcl/dialog.hxx>
diff --git a/padmin/source/padialog.hxx b/padmin/source/padialog.hxx
index 42f034b..337bb14 100644
--- a/padmin/source/padialog.hxx
+++ b/padmin/source/padialog.hxx
@@ -28,12 +28,8 @@
#ifndef _PAD_PADIALOG_HXX_
#define _PAD_PADIALOG_HXX_
-#ifndef __SGI_STL_LIST
#include <list>
-#endif
-#ifndef _RTL_USTRING
#include <rtl/ustring.hxx>
-#endif
#include <vcl/dialog.hxx>
#include <tools/config.hxx>
#include <vcl/lstbox.hxx>
commit c04c8e918bd4a3095bd95cc0f74137bff17f7753
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Sep 28 22:42:20 2011 +0100
ByteString->rtl::OStringBuffer
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index ef6557e..6583e51 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -188,7 +188,7 @@ private:
sal_Int32 m_index;
};
-bool addArgument(ByteString &rArguments, char prefix,
+bool addArgument(rtl::OStringBuffer &rArguments, char prefix,
const rtl::OUString &rArgument)
{
rtl::OString utf8;
@@ -199,21 +199,21 @@ bool addArgument(ByteString &rArguments, char prefix,
{
return false;
}
- rArguments += prefix;
+ rArguments.append(prefix);
for (sal_Int32 i = 0; i < utf8.getLength(); ++i) {
char c = utf8[i];
switch (c) {
case '\0':
- rArguments += "\\0";
+ rArguments.append("\\0");
break;
case ',':
- rArguments += "\\,";
+ rArguments.append("\\,");
break;
case '\\':
- rArguments += "\\\\";
+ rArguments.append("\\\\");
break;
default:
- rArguments += c;
+ rArguments.append(c);
break;
}
}
@@ -539,12 +539,13 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread()
// Seems another office is running. Pipe arguments to it and self terminate
osl::StreamPipe aStreamPipe(pThread->maPipe.getHandle());
- ByteString aArguments(RTL_CONSTASCII_STRINGPARAM(ARGUMENT_PREFIX));
+ rtl::OStringBuffer aArguments(RTL_CONSTASCII_STRINGPARAM(
+ ARGUMENT_PREFIX));
rtl::OUString cwdUrl;
if (!(tools::getProcessWorkingDir(cwdUrl) &&
addArgument(aArguments, '1', cwdUrl)))
{
- aArguments += '0';
+ aArguments.append('0');
}
sal_uInt32 nCount = rtl_getAppCommandArgCount();
for( sal_uInt32 i=0; i < nCount; i++ )
@@ -555,8 +556,8 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread()
}
}
// finally, write the string onto the pipe
- aStreamPipe.write( aArguments.GetBuffer(), aArguments.Len() );
- aStreamPipe.write( "\0", 1 );
+ aStreamPipe.write(aArguments.getStr(), aArguments.getLength());
+ aStreamPipe.write("\0", 1);
ByteString aToken(sc_aConfirmationSequence);
char *aReceiveBuffer = new char[aToken.Len()+1];
commit af1a8de15e0b8b9a74ff891a8b5e2e6310631358
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Sep 28 22:39:16 2011 +0100
why use a pointer when a reference will do
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index 022ccf1..ef6557e 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -188,32 +188,32 @@ private:
sal_Int32 m_index;
};
-bool addArgument(
- ByteString * arguments, char prefix, rtl::OUString const & argument)
+bool addArgument(ByteString &rArguments, char prefix,
+ const rtl::OUString &rArgument)
{
rtl::OString utf8;
- if (!argument.convertToString(
+ if (!rArgument.convertToString(
&utf8, RTL_TEXTENCODING_UTF8,
(RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR |
RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR)))
{
return false;
}
- *arguments += prefix;
+ rArguments += prefix;
for (sal_Int32 i = 0; i < utf8.getLength(); ++i) {
char c = utf8[i];
switch (c) {
case '\0':
- *arguments += "\\0";
+ rArguments += "\\0";
break;
case ',':
- *arguments += "\\,";
+ rArguments += "\\,";
break;
case '\\':
- *arguments += "\\\\";
+ rArguments += "\\\\";
break;
default:
- *arguments += c;
+ rArguments += c;
break;
}
}
@@ -542,7 +542,7 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread()
ByteString aArguments(RTL_CONSTASCII_STRINGPARAM(ARGUMENT_PREFIX));
rtl::OUString cwdUrl;
if (!(tools::getProcessWorkingDir(cwdUrl) &&
- addArgument(&aArguments, '1', cwdUrl)))
+ addArgument(aArguments, '1', cwdUrl)))
{
aArguments += '0';
}
@@ -550,7 +550,7 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread()
for( sal_uInt32 i=0; i < nCount; i++ )
{
rtl_getAppCommandArg( i, &aDummy.pData );
- if (!addArgument(&aArguments, ',', aDummy)) {
+ if (!addArgument(aArguments, ',', aDummy)) {
return IPC_STATUS_BOOTSTRAP_ERROR;
}
}
commit c8e290d644a3a770e73f11412459e7bc068428ff
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Sep 28 22:29:07 2011 +0100
ByteString->rtl::OString
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index 574f51d..5905b72 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -1892,8 +1892,8 @@ static Writer& OutCSS1_SwPageDesc( Writer& rWrt, const SwPageDesc& rPageDesc,
if( rHTMLWrt.bFirstCSS1Property && bPseudo )
{
rHTMLWrt.OutNewLine();
- ByteString sTmp( aSelector, rHTMLWrt.eDestEnc );
- rWrt.Strm() << sTmp.GetBuffer() << " {";
+ rtl::OString sTmp(rtl::OUStringToOString(aSelector, rHTMLWrt.eDestEnc));
+ rWrt.Strm() << sTmp.getStr() << " {";
rHTMLWrt.bFirstCSS1Property = sal_False;
}
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index f8d8c8c..2d56070 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -965,7 +965,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
// ausgegeben, wenn,
// - keine Styles geschrieben werden, und
// - ein untere Abstand oder eine Absatz-Ausrichtung existiert
- ByteString aToken = rInfo.aToken;
+ rtl::OString aToken = rInfo.aToken;
if( !rHWrt.bCfgOutStyles && rInfo.bParaPossible && !bPara &&
(bHasParSpace || pAdjItem) )
{
commit d1c8b0bb8642f21bdc10f1ba76717d499556faac
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Sep 28 22:17:59 2011 +0100
ByteString->rtl::OString[Buffer}
diff --git a/filter/source/graphicfilter/idxf/dxfgrprd.cxx b/filter/source/graphicfilter/idxf/dxfgrprd.cxx
index 176db97..e52662e 100644
--- a/filter/source/graphicfilter/idxf/dxfgrprd.cxx
+++ b/filter/source/graphicfilter/idxf/dxfgrprd.cxx
@@ -31,6 +31,7 @@
#include <string.h>
#include <stdlib.h>
+#include <rtl/strbuf.hxx>
#include <tools/stream.hxx>
#include "dxfgrprd.hxx"
@@ -40,14 +41,14 @@
// a 0-sign occurs; this functions converts 0-signs to blanks and reads
// a complete line until a cr/lf is found
-sal_Bool DXFReadLine( SvStream& rIStm, ByteString& rStr )
+rtl::OString DXFReadLine(SvStream& rIStm)
{
char buf[256 + 1];
sal_Bool bEnd = sal_False;
sal_uLong nOldFilePos = rIStm.Tell();
char c = 0;
- rStr.Erase();
+ rtl::OStringBuffer aBuf;
while( !bEnd && !rIStm.GetError() ) // !!! nicht auf EOF testen,
// !!! weil wir blockweise
@@ -56,8 +57,8 @@ sal_Bool DXFReadLine( SvStream& rIStm, ByteString& rStr )
sal_uInt16 nLen = (sal_uInt16)rIStm.Read( buf, sizeof(buf)-1 );
if( !nLen )
{
- if( rStr.Len() == 0 )
- return sal_False;
+ if( aBuf.getLength() == 0 )
+ return rtl::OString();
else
break;
}
@@ -69,7 +70,7 @@ sal_Bool DXFReadLine( SvStream& rIStm, ByteString& rStr )
{
if( !c )
c = ' ';
- rStr += c;
+ aBuf.append(c);
}
else
{
@@ -79,23 +80,23 @@ sal_Bool DXFReadLine( SvStream& rIStm, ByteString& rStr )
}
}
- if( !bEnd && !rIStm.GetError() && rStr.Len() )
+ if( !bEnd && !rIStm.GetError() && aBuf.getLength() )
bEnd = sal_True;
- nOldFilePos += rStr.Len();
+ nOldFilePos += aBuf.getLength();
if( rIStm.Tell() > nOldFilePos )
nOldFilePos++;
rIStm.Seek( nOldFilePos ); // seeken wg. obigem BlockRead!
if( bEnd && (c=='\r' || c=='\n')) // Sonderbehandlung DOS-Dateien
{
- char cTemp;
- rIStm.Read((char*)&cTemp , sizeof(cTemp) );
+ char cTemp(0);
+ rIStm.Read(&cTemp, 1);
if( cTemp == c || (cTemp != '\n' && cTemp != '\r') )
rIStm.Seek( nOldFilePos );
}
- return bEnd;
+ return aBuf.makeStringAndClear();
}
// ------------------
@@ -274,30 +275,14 @@ void DXFGroupReader::SetS(sal_uInt16 nG, const char * sS)
void DXFGroupReader::ReadLine(char * ptgt)
{
- ByteString aStr;
- sal_uLong nLen;
+ rtl::OString aStr = DXFReadLine(rIS);
- DXFReadLine( rIS, aStr );
-
- nLen = aStr.Len();
+ size_t nLen = aStr.getLength();
if ( nLen > DXF_MAX_STRING_LEN )
nLen = DXF_MAX_STRING_LEN;
- memcpy( ptgt, aStr.GetBuffer(), nLen );
+ memcpy( ptgt, aStr.getStr(), nLen );
ptgt[ nLen ] = 0x00;
-/*
- if ( pCallback )
- {
- const sal_uLong nPercent= nMinPercent + (nMaxPercent-nMinPercent)*rIS.Tell() / nFileSize;
-
- if ( nPercent >= nLastPercent + 4 )
- {
- nLastPercent=nPercent;
- if (((*pCallback)(pCallerData,(sal_uInt16)nPercent))==sal_True)
- bStatus=sal_False;
- }
- }
-*/
}
commit c50612d51619fb92393f32c6832628ffbbdcb920
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Sep 28 21:07:19 2011 +0100
callcatcher: unused code
diff --git a/basic/inc/basic/sbmeth.hxx b/basic/inc/basic/sbmeth.hxx
index 03de66f..8268b60 100644
--- a/basic/inc/basic/sbmeth.hxx
+++ b/basic/inc/basic/sbmeth.hxx
@@ -65,7 +65,6 @@ public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_BASICMETHOD,2);
TYPEINFO();
virtual SbxInfo* GetInfo();
- SbxArray* GetLocals();
SbxArray* GetStatics();
void ClearStatics();
SbModule* GetModule() { return pMod; }
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 2fd6fbf..3c2f1f2 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -2063,14 +2063,6 @@ SbMethod::~SbMethod()
{
}
-SbxArray* SbMethod::GetLocals()
-{
- if( pINST )
- return pINST->GetLocals( this );
- else
- return NULL;
-}
-
void SbMethod::ClearStatics()
{
refStatics = new SbxArray;
diff --git a/editeng/inc/editeng/outliner.hxx b/editeng/inc/editeng/outliner.hxx
index 9a68727..23dfe65 100644
--- a/editeng/inc/editeng/outliner.hxx
+++ b/editeng/inc/editeng/outliner.hxx
@@ -238,14 +238,11 @@ private:
EDITENG_DLLPRIVATE void ImpHideDDCursor();
EDITENG_DLLPRIVATE void ImpPaintDDCursor();
- EDITENG_DLLPRIVATE void ImpDragScroll( const Point& rPosPix );
EDITENG_DLLPRIVATE void ImpScrollLeft();
EDITENG_DLLPRIVATE void ImpScrollRight();
EDITENG_DLLPRIVATE void ImpScrollUp();
EDITENG_DLLPRIVATE void ImpScrollDown();
- EDITENG_DLLPRIVATE sal_uLong ImpGetInsertionPara( const Point& rPosPixel );
- EDITENG_DLLPRIVATE Point ImpGetDocPos( const Point& rPosPixel );
EDITENG_DLLPRIVATE Pointer ImpGetMousePointer( MouseTarget eTarget );
EDITENG_DLLPRIVATE sal_uInt16 ImpInitPaste( sal_uLong& rStart );
EDITENG_DLLPRIVATE void ImpPasted( sal_uLong nStart, sal_uLong nPrevParaCount, sal_uInt16 nSize);
@@ -271,7 +268,6 @@ public:
void ShowCursor( sal_Bool bGotoCursor = sal_True );
void HideCursor();
- void SetOutliner( Outliner* pOutliner );
Outliner* GetOutliner() const { return pOwner; }
void SetWindow( Window* pWindow );
@@ -299,10 +295,6 @@ public:
void AdjustDepth( short nDX ); // Later replace with Indent!
sal_Bool AdjustHeight( long nDY );
- void AdjustDepth( Paragraph* pPara, short nDX,
- sal_Bool bWithChilds = sal_False );
- void AdjustHeight( Paragraph* pPara, long nDY,
- sal_Bool bWithChilds=sal_False );
sal_uLong Read( SvStream& rInput, const String& rBaseURL, EETextFormat eFormat, sal_Bool bSelect = sal_False, SvKeyValueIterator* pHTTPHeaderAttrs = NULL );
@@ -310,8 +302,6 @@ public:
void InsertText( const OutlinerParaObject& rParaObj );
void Expand();
void Collapse();
- void Expand( Paragraph* );
- void Collapse( Paragraph* );
void ExpandAll();
void CollapseAll();
@@ -324,12 +314,7 @@ public:
void Copy();
void Paste();
void PasteSpecial();
- void EnablePaste( sal_Bool bEnable );
- void Undo();
- void Redo();
-
- void SetStyleSheet( SfxStyleSheet* );
SfxStyleSheet* GetStyleSheet() const;
void SetControlWord( sal_uLong nWord );
@@ -340,9 +325,6 @@ public:
Pointer GetPointer( const Point& rPosPixel );
void Command( const CommandEvent& rCEvt );
- void RemoveCharAttribs( sal_uLong nPara, sal_uInt16 nWhich = 0 );
-
- void CompleteAutoCorrect();
EESpellState StartSpeller( sal_Bool bMultipleDoc = sal_False );
EESpellState StartThesaurus();
@@ -366,7 +348,6 @@ public:
void InsertField( const SvxFieldItem& rFld );
const SvxFieldItem* GetFieldUnderMousePointer() const;
- const SvxFieldItem* GetFieldUnderMousePointer( sal_uInt16& nPara, xub_StrLen& nPos ) const;
const SvxFieldItem* GetFieldAtSelection() const;
/** enables numbering for the selected paragraphs if the numbering of the first paragraph is off
@@ -381,7 +362,6 @@ public:
sal_Bool IsCursorAtWrongSpelledWord( sal_Bool bMarkIfWrong = sal_False );
sal_Bool IsWrongSpelledWordAtPos( const Point& rPosPixel, sal_Bool bMarkIfWrong = sal_False );
- void SpellIgnoreWord();
void ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack = 0 );
void SetInvalidateMore( sal_uInt16 nPixel );
diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx
index f8fe488..2c87222 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -458,34 +458,6 @@ void OutlinerView::ImpPaintDDCursor()
pWindow->SetRasterOp( eOldOp );
}
-// Calculates above which paragraph must it must be inserted
-
-sal_uLong OutlinerView::ImpGetInsertionPara( const Point& rPosPixel )
-{
- DBG_CHKTHIS(OutlinerView,0);
- sal_uLong nCurPara = pEditView->GetParagraph( rPosPixel );
- ParagraphList* pParaList = pOwner->pParaList;
-
- if ( nCurPara == EE_PARA_NOT_FOUND )
- nCurPara = LIST_APPEND;
- else
- {
- Point aPosWin = pEditView->GetWindow()->PixelToLogic( rPosPixel );
- Point aParaPosWin = pEditView->GetWindowPosTopLeft((sal_uInt16)nCurPara);
- long nHeightRef = pOwner->pEditEngine->GetTextHeight((sal_uInt16)nCurPara);
- long nParaYOffs = aPosWin.Y() - aParaPosWin.Y();
-
- if ( nParaYOffs > nHeightRef / 2 )
- {
- Paragraph* p = pParaList->GetParagraph( nCurPara );
- p = pParaList->NextVisible( p );
- nCurPara = p ? pParaList->GetAbsPos( p ) : LIST_APPEND;
- }
- }
- return nCurPara;
-}
-
-
void OutlinerView::ImpToggleExpand( Paragraph* pPara )
{
DBG_CHKTHIS(OutlinerView,0);
@@ -496,16 +468,6 @@ void OutlinerView::ImpToggleExpand( Paragraph* pPara )
pEditView->ShowCursor();
}
-
-void OutlinerView::SetOutliner( Outliner* pOutliner )
-{
- DBG_CHKTHIS(OutlinerView,0);
- pOwner = pOutliner;
- pEditView->SetEditEngine( pOutliner->pEditEngine );
-}
-
-
-
sal_uLong OutlinerView::Select( Paragraph* pParagraph, sal_Bool bSelect,
sal_Bool bWithChilds )
{
@@ -725,66 +687,12 @@ sal_Bool OutlinerView::AdjustHeight( long nDY )
return sal_True; // remove return value...
}
-void OutlinerView::AdjustDepth( Paragraph* pPara, short nDX, sal_Bool bWithChilds)
-{
- DBG_CHKTHIS(OutlinerView,0);
- sal_uLong nStartPara = pOwner->pParaList->GetAbsPos( pPara );
- sal_uLong nEndPara = nStartPara;
- if ( bWithChilds )
- nEndPara += pOwner->pParaList->GetChildCount( pPara );
- ESelection aSel((sal_uInt16)nStartPara, 0,(sal_uInt16)nEndPara, 0xffff );
- pEditView->SetSelection( aSel );
- AdjustDepth( nDX );
-}
-
-void OutlinerView::AdjustHeight( Paragraph* pPara, long nDY, sal_Bool bWithChilds )
-{
- DBG_CHKTHIS(OutlinerView,0);
- sal_uLong nStartPara = pOwner->pParaList->GetAbsPos( pPara );
- sal_uLong nEndPara = nStartPara;
- if ( bWithChilds )
- nEndPara += pOwner->pParaList->GetChildCount( pPara );
- ESelection aSel( (sal_uInt16)nStartPara, 0, (sal_uInt16)nEndPara, 0xffff );
- pEditView->SetSelection( aSel );
- AdjustHeight( nDY );
-}
-
-
Rectangle OutlinerView::GetVisArea() const
{
DBG_CHKTHIS(OutlinerView,0);
return pEditView->GetVisArea();
}
-
-Point OutlinerView::ImpGetDocPos( const Point& rPosPixel )
-{
- DBG_CHKTHIS(OutlinerView,0);
- Rectangle aOutArWin = GetOutputArea();
- // Calculate position in the OutputArea
- Point aCurPosDoc( rPosPixel );
- aCurPosDoc = pEditView->GetWindow()->PixelToLogic( aCurPosDoc );
- aCurPosDoc -= aOutArWin.TopLeft();
- aCurPosDoc += pEditView->GetVisArea().TopLeft();
- return aCurPosDoc;
-}
-
-void OutlinerView::ImpDragScroll( const Point& rPosPix )
-{
- DBG_CHKTHIS(OutlinerView,0);
- Point aPosWin = pEditView->GetWindow()->PixelToLogic( rPosPix );
- Rectangle aOutputArWin = pEditView->GetOutputArea();
- if ( aPosWin.X() <= aOutputArWin.Left() + nDDScrollLRBorderWidthWin)
- ImpScrollLeft();
- else if( aPosWin.X() >= aOutputArWin.Right()- nDDScrollLRBorderWidthWin)
- ImpScrollRight();
- else if( aPosWin.Y() <= aOutputArWin.Top() + nDDScrollTBBorderWidthWin)
- ImpScrollUp();
- else if(aPosWin.Y() >= aOutputArWin.Bottom() - nDDScrollTBBorderWidthWin)
- ImpScrollDown();
-}
-
-
void OutlinerView::ImpScrollLeft()
{
DBG_CHKTHIS(OutlinerView,0);
@@ -943,20 +851,6 @@ void OutlinerView::ImplExpandOrCollaps( sal_uInt16 nStartPara, sal_uInt16 nEndPa
}
}
-
-void OutlinerView::Expand( Paragraph* pPara)
-{
- DBG_CHKTHIS(OutlinerView,0);
- pOwner->Expand( pPara );
-}
-
-
-void OutlinerView::Collapse( Paragraph* pPara)
-{
- DBG_CHKTHIS(OutlinerView,0);
- pOwner->Collapse( pPara );
-}
-
void OutlinerView::InsertText( const OutlinerParaObject& rParaObj )
{
// Like Paste, only EditView::Insert, instead of EditView::Paste.
@@ -1047,19 +941,6 @@ SfxStyleSheet* OutlinerView::GetStyleSheet() const
return pEditView->GetStyleSheet();
}
-void OutlinerView::SetStyleSheet( SfxStyleSheet* pStyle )
-{
- DBG_CHKTHIS(OutlinerView,0);
- pEditView->SetStyleSheet( pStyle );
-
- ParaRange aSel = ImpGetSelectedParagraphs( sal_True );
- for( sal_uInt16 nPara = aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ )
- {
- pOwner->ImplCheckNumBulletItem( nPara );
- pOwner->ImplCalcBulletText( nPara, sal_False, sal_False );
- }
-}
-
Pointer OutlinerView::GetPointer( const Point& rPosPixel )
{
DBG_CHKTHIS(OutlinerView,0);
@@ -1375,28 +1256,12 @@ XubString OutlinerView::GetSelected() const
return pEditView->GetSelected();
}
-
-void OutlinerView::RemoveCharAttribs( sal_uLong nPara, sal_uInt16 nWhich)
-{
- DBG_CHKTHIS(OutlinerView,0);
- pEditView->RemoveCharAttribs( (sal_uInt16)nPara, nWhich);
-}
-
-
-void OutlinerView::CompleteAutoCorrect()
-{
- DBG_CHKTHIS(OutlinerView,0);
- pEditView->CompleteAutoCorrect();
-}
-
-
EESpellState OutlinerView::StartSpeller( sal_Bool bMultiDoc )
{
DBG_CHKTHIS(OutlinerView,0);
return pEditView->StartSpeller( bMultiDoc );
}
-
EESpellState OutlinerView::StartThesaurus()
{
DBG_CHKTHIS(OutlinerView,0);
@@ -1479,28 +1344,6 @@ EVAnchorMode OutlinerView::GetAnchorMode() const
return pEditView->GetAnchorMode();
}
-
-void OutlinerView::Undo()
-{
- DBG_CHKTHIS(OutlinerView,0);
- pEditView->Undo();
-}
-
-
-void OutlinerView::Redo()
-{
- DBG_CHKTHIS(OutlinerView,0);
- pEditView->Redo();
-}
-
-
-void OutlinerView::EnablePaste( sal_Bool bEnable )
-{
- DBG_CHKTHIS(OutlinerView,0);
- pEditView->EnablePaste( bEnable );
-}
-
-
void OutlinerView::Copy()
{
DBG_CHKTHIS(OutlinerView,0);
@@ -1514,21 +1357,12 @@ void OutlinerView::InsertField( const SvxFieldItem& rFld )
pEditView->InsertField( rFld );
}
-
const SvxFieldItem* OutlinerView::GetFieldUnderMousePointer() const
{
DBG_CHKTHIS(OutlinerView,0);
return pEditView->GetFieldUnderMousePointer();
}
-
-const SvxFieldItem* OutlinerView::GetFieldUnderMousePointer( sal_uInt16& nPara, sal_uInt16& nPos ) const
-{
- DBG_CHKTHIS(OutlinerView,0);
- return pEditView->GetFieldUnderMousePointer( nPara, nPos );
-}
-
-
const SvxFieldItem* OutlinerView::GetFieldAtSelection() const
{
DBG_CHKTHIS(OutlinerView,0);
@@ -1562,14 +1396,6 @@ sal_Bool OutlinerView::IsWrongSpelledWordAtPos( const Point& rPosPixel, sal_Bool
return pEditView->IsWrongSpelledWordAtPos( rPosPixel, bMarkIfWrong );
}
-
-void OutlinerView::SpellIgnoreWord()
-{
- DBG_CHKTHIS(OutlinerView,0);
- pEditView->SpellIgnoreWord();
-}
-
-
void OutlinerView::ExecuteSpellPopup( const Point& rPosPixel, Link* pStartDlg )
{
DBG_CHKTHIS(OutlinerView,0);
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index d85cbaf..cc392c7 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -105,8 +105,7 @@ class MaskSet : public ValueSet
public:
- MaskSet( SvxBmpMask* pParent, WinBits nWinStyle );
- MaskSet( SvxBmpMask* pParent, const ResId& rId );
+ MaskSet( SvxBmpMask* pParent, const ResId& rId );
virtual void Select();
virtual void KeyInput( const KeyEvent& rKEvt );
@@ -117,14 +116,6 @@ public:
//-------------------------------------------------------------------------
-MaskSet::MaskSet( SvxBmpMask* pParent, WinBits nWinStyle ) :
- ValueSet ( pParent, nWinStyle ),
- pSvxBmpMask ( pParent )
-{
-}
-
-//-------------------------------------------------------------------------
-
MaskSet::MaskSet( SvxBmpMask* pParent, const ResId& rId ) :
ValueSet ( pParent, rId ),
pSvxBmpMask ( pParent )
diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx
index def82b4..0b5f236 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -1490,6 +1490,7 @@ void VCLXWindow::setProperty( const ::rtl::OUString& PropertyName, const ::com::
case MouseWheelBehavior::SCROLL_FOCUS_ONLY: nVclBehavior = MOUSE_WHEEL_FOCUS_ONLY; break;
case MouseWheelBehavior::SCROLL_ALWAYS: nVclBehavior = MOUSE_WHEEL_ALWAYS; break;
default:
+ fprintf(stderr, "nVclBehavior is %d\n", nWheelBehavior);
OSL_FAIL( "VCLXWindow::setProperty( 'MouseWheelBehavior' ): illegal property value!" );
}
diff --git a/unusedcode.easy b/unusedcode.easy
index fb29748..3eb0e3b 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1385,6 +1385,10 @@ WP42SubDocument::WP42SubDocument(unsigned char*, unsigned int)
WP6SubDocument::WP6SubDocument(WPXInputStream*, WPXEncryption*, unsigned int)
WPGTextDataHandler::endSubDocument()
WPS8Parser::readText(WPXInputStream*, WPS8ContentListener*)
+WPSContentListener::closeEndnote()
+WPSContentListener::closeFootnote()
+WPSContentListener::openEndnote()
+WPSContentListener::openFootnote()
WPXPropertyList::Iter::last()
WPXPropertyListVector::Iter::last()
WPXString::Iter::last()
@@ -1980,7 +1984,6 @@ binfilter::SwXRedlinePortionArr::Insert(binfilter::SwXRedlinePortionArr const*,
binfilter::SwXRedlinePortionArr::Insert(binfilter::SwXRedlinePortion_Impl* const&, unsigned short&)
binfilter::SwXRedlinePortionArr::Insert(binfilter::SwXRedlinePortion_Impl* const*, unsigned short)
binfilter::SwXRedlinePortionArr::Remove(binfilter::SwXRedlinePortion_Impl* const&, unsigned short)
-binfilter::SwXTextCursor::SwXTextCursor(com::sun::star::uno::Reference<com::sun::star::text::XText>, binfilter::SwUnoCrsr*, binfilter::CursorType)
binfilter::SwpHtEnd::Insert(binfilter::SwTxtAttr const*&, unsigned short&)
binfilter::SwpHtEnd::Insert(binfilter::SwTxtAttr const**, unsigned short)
binfilter::SwpHtEnd::Insert(binfilter::SwpHtEnd const*, unsigned short, unsigned short)
diff --git a/vcl/inc/vcl/event.hxx b/vcl/inc/vcl/event.hxx
index 9e8666e..2fe32e7 100644
--- a/vcl/inc/vcl/event.hxx
+++ b/vcl/inc/vcl/event.hxx
@@ -143,9 +143,6 @@ public:
/** inits this vcl KeyEvent with all settings from the given awt event **/
MouseEvent( const ::com::sun::star::awt::MouseEvent& rEvent );
- /** fills out the given awt KeyEvent with all settings from this vcl event **/
- void InitMouseEvent( ::com::sun::star::awt::MouseEvent& rEvent ) const;
-
sal_uInt16 GetClicks() const { return mnClicks; }
sal_Bool IsEnterWindow() const
diff --git a/vcl/source/window/mouseevent.cxx b/vcl/source/window/mouseevent.cxx
index 2e76750..220bad7 100644
--- a/vcl/source/window/mouseevent.cxx
+++ b/vcl/source/window/mouseevent.cxx
@@ -65,31 +65,4 @@ MouseEvent::MouseEvent( const ::com::sun::star::awt::MouseEvent& rEvent )
}
}
-/** fills out the given awt KeyEvent with all settings from this vcl event **/
-void MouseEvent::InitMouseEvent( ::com::sun::star::awt::MouseEvent& rEvent ) const
-{
- rEvent.Modifiers = 0;
- if ( IsShift() )
- rEvent.Modifiers |= ::com::sun::star::awt::KeyModifier::SHIFT;
- if ( IsMod1() )
- rEvent.Modifiers |= ::com::sun::star::awt::KeyModifier::MOD1;
- if ( IsMod2() )
- rEvent.Modifiers |= ::com::sun::star::awt::KeyModifier::MOD2;
- if ( IsMod3() )
- rEvent.Modifiers |= ::com::sun::star::awt::KeyModifier::MOD3;
-
- rEvent.Buttons = 0;
- if ( IsLeft() )
- rEvent.Buttons |= ::com::sun::star::awt::MouseButton::LEFT;
- if ( IsRight() )
- rEvent.Buttons |= ::com::sun::star::awt::MouseButton::RIGHT;
- if ( IsMiddle() )
- rEvent.Buttons |= ::com::sun::star::awt::MouseButton::MIDDLE;
-
- rEvent.X = GetPosPixel().X();
- rEvent.Y = GetPosPixel().Y();
- rEvent.ClickCount = GetClicks();
- rEvent.PopupTrigger = sal_False;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/MultiPropertySetHelper.hxx b/xmloff/inc/MultiPropertySetHelper.hxx
index a64e8c8..2c7d7ab 100644
--- a/xmloff/inc/MultiPropertySetHelper.hxx
+++ b/xmloff/inc/MultiPropertySetHelper.hxx
@@ -90,8 +90,6 @@ public:
MultiPropertySetHelper( const sal_Char** pNames );
- MultiPropertySetHelper( const ::rtl::OUString* pNames );
-
~MultiPropertySetHelper();
diff --git a/xmloff/source/style/MultiPropertySetHelper.cxx b/xmloff/source/style/MultiPropertySetHelper.cxx
index dc5e2ee..ae3f963 100644
--- a/xmloff/source/style/MultiPropertySetHelper.cxx
+++ b/xmloff/source/style/MultiPropertySetHelper.cxx
@@ -72,25 +72,6 @@ MultiPropertySetHelper::MultiPropertySetHelper(
pPropertyNames[i] = OUString::createFromAscii( pNames[i] );
}
-MultiPropertySetHelper::MultiPropertySetHelper(
- const OUString* pNames ) :
- pPropertyNames( NULL ),
- nLength( 0 ),
- aPropertySequence(),
- pSequenceIndex( NULL ),
- aValues(),
- pValues( NULL )
-{
- // count elements
- for( const OUString* pPtr = pNames; pPtr != NULL; pPtr++ )
- nLength++;
-
- // allocate array and assign strings
- pPropertyNames = new OUString[nLength];
- for( sal_Int16 i = 0; i < nLength; i++ )
- pPropertyNames[i] = pNames[i];
-}
-
MultiPropertySetHelper::~MultiPropertySetHelper()
{
@@ -101,7 +82,6 @@ MultiPropertySetHelper::~MultiPropertySetHelper()
}
-
void MultiPropertySetHelper::hasProperties(
const Reference<XPropertySetInfo> & rInfo )
{
More information about the Libreoffice-commits
mailing list