[Libreoffice-commits] .: 7 commits - l10ntools/inc l10ntools/source svl/source svtools/source tools/inc vcl/inc vcl/source vcl/unx
Caolán McNamara
caolan at kemper.freedesktop.org
Thu Jul 14 07:35:36 PDT 2011
l10ntools/inc/helpmerge.hxx | 13 +--
l10ntools/source/helpmerge.cxx | 99 ++++----------------------
svl/source/misc/inettype.cxx | 7 -
svtools/source/contnr/imivctl.hxx | 1
svtools/source/contnr/imivctl2.cxx | 49 ------------
tools/inc/tools/inetmime.hxx | 7 -
vcl/inc/saltimer.hxx | 3
vcl/inc/svsys.h | 3
vcl/inc/unx/Xproto.h | 3
vcl/inc/unx/x11_cursors/salcursors.h | 3
vcl/inc/vcl/displayconnectiondispatch.hxx | 3
vcl/inc/vcl/help.hxx | 2
vcl/inc/vcl/quickselectionengine.hxx | 3
vcl/inc/vcl/rendergraphic.hxx | 3
vcl/inc/vcl/rendergraphicrasterizer.hxx | 3
vcl/inc/vcl/throbber.hxx | 2
vcl/source/app/help.cxx | 28 -------
vcl/source/components/rasterizer_rsvg.cxx | 3
vcl/source/components/stringmirror.cxx | 3
vcl/source/control/quickselectionengine.cxx | 3
vcl/source/control/throbber.cxx | 3
vcl/source/gdi/pdfwriter_impl2.cxx | 3
vcl/source/gdi/rendergraphic.cxx | 3
vcl/source/gdi/rendergraphicrasterizer.cxx | 3
vcl/source/gdi/svgread.cxx | 3
vcl/source/window/window4.cxx | 2
vcl/source/window/wpropset.cxx | 3
vcl/unx/gtk3/a11y/gtk3atkaction.cxx | 3
vcl/unx/gtk3/a11y/gtk3atkbridge.cxx | 3
vcl/unx/gtk3/a11y/gtk3atkcomponent.cxx | 3
vcl/unx/gtk3/a11y/gtk3atkeditabletext.cxx | 3
vcl/unx/gtk3/a11y/gtk3atkfactory.cxx | 3
vcl/unx/gtk3/a11y/gtk3atkhypertext.cxx | 3
vcl/unx/gtk3/a11y/gtk3atkimage.cxx | 3
vcl/unx/gtk3/a11y/gtk3atklistener.cxx | 3
vcl/unx/gtk3/a11y/gtk3atkregistry.cxx | 3
vcl/unx/gtk3/a11y/gtk3atkselection.cxx | 3
vcl/unx/gtk3/a11y/gtk3atktable.cxx | 3
vcl/unx/gtk3/a11y/gtk3atktext.cxx | 3
vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx | 3
vcl/unx/gtk3/a11y/gtk3atkutil.cxx | 3
vcl/unx/gtk3/a11y/gtk3atkvalue.cxx | 3
vcl/unx/gtk3/a11y/gtk3atkwindow.cxx | 3
vcl/unx/gtk3/a11y/gtk3atkwrapper.cxx | 3
vcl/unx/gtk3/app/gtk3gtkdata.cxx | 3
vcl/unx/gtk3/app/gtk3gtkinst.cxx | 3
vcl/unx/gtk3/app/gtk3gtksys.cxx | 3
vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx | 2
vcl/unx/gtk3/window/gtk3gtkframe.cxx | 3
vcl/unx/gtk3/window/gtk3gtkobject.cxx | 3
50 files changed, 145 insertions(+), 184 deletions(-)
New commits:
commit 56973bba35cc1105ca1927a9c0c3f0dcad23450c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jul 13 21:51:01 2011 +0100
add missing mode-lines
diff --git a/vcl/inc/saltimer.hxx b/vcl/inc/saltimer.hxx
index 0f5c41f..e208d09 100644
--- a/vcl/inc/saltimer.hxx
+++ b/vcl/inc/saltimer.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.
@@ -67,3 +68,5 @@ public:
};
#endif // _SV_SALTIMER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/svsys.h b/vcl/inc/svsys.h
index ce65f4a..0976282 100644
--- a/vcl/inc/svsys.h
+++ b/vcl/inc/svsys.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.
@@ -44,3 +45,5 @@
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/Xproto.h b/vcl/inc/unx/Xproto.h
index 804b3ff..b6db98d 100644
--- a/vcl/inc/unx/Xproto.h
+++ b/vcl/inc/unx/Xproto.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.
@@ -47,3 +48,5 @@
#include <tools/postx.h>
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/salcursors.h b/vcl/inc/unx/x11_cursors/salcursors.h
index e0d34e1..6af2c11 100644
--- a/vcl/inc/unx/x11_cursors/salcursors.h
+++ b/vcl/inc/unx/x11_cursors/salcursors.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.
@@ -160,3 +161,5 @@
#include "unx/x11_cursors/tblselsw_mask.h"
#include "unx/x11_cursors/paintbrush_curs.h"
#include "unx/x11_cursors/paintbrush_mask.h"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/vcl/displayconnectiondispatch.hxx b/vcl/inc/vcl/displayconnectiondispatch.hxx
index fea1d0b..0804c91 100644
--- a/vcl/inc/vcl/displayconnectiondispatch.hxx
+++ b/vcl/inc/vcl/displayconnectiondispatch.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.
@@ -50,3 +51,5 @@ protected:
}
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/vcl/quickselectionengine.hxx b/vcl/inc/vcl/quickselectionengine.hxx
index 84c789e..cafbbfa 100644
--- a/vcl/inc/vcl/quickselectionengine.hxx
+++ b/vcl/inc/vcl/quickselectionengine.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.
*
@@ -93,3 +94,5 @@ namespace vcl
//........................................................................
#endif // VCL_QUICKSELECTIONENGINE_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/vcl/rendergraphic.hxx b/vcl/inc/vcl/rendergraphic.hxx
index 0a0f475..bee2abf 100644
--- a/vcl/inc/vcl/rendergraphic.hxx
+++ b/vcl/inc/vcl/rendergraphic.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,5 @@ namespace vcl
}
#endif // _SV_RENDERHRAPHIC_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/vcl/rendergraphicrasterizer.hxx b/vcl/inc/vcl/rendergraphicrasterizer.hxx
index f2166b0..0f564a6 100644
--- a/vcl/inc/vcl/rendergraphicrasterizer.hxx
+++ b/vcl/inc/vcl/rendergraphicrasterizer.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.
@@ -109,3 +110,5 @@ namespace vcl
}
#endif // _SV_RENDERGRAPHICRASTERIZER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/vcl/throbber.hxx b/vcl/inc/vcl/throbber.hxx
index 95c0ebe..f226183 100644
--- a/vcl/inc/vcl/throbber.hxx
+++ b/vcl/inc/vcl/throbber.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.
@@ -99,3 +100,4 @@ private:
#endif // VCL_THROBBER_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/components/rasterizer_rsvg.cxx b/vcl/source/components/rasterizer_rsvg.cxx
index b68aaa1..ef0d5f8 100644
--- a/vcl/source/components/rasterizer_rsvg.cxx
+++ b/vcl/source/components/rasterizer_rsvg.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.
@@ -542,3 +543,5 @@ uno::Reference< uno::XInterface > SAL_CALL Rasterizer_createInstance( const uno:
} // namespace rsvg
} // namespace vcl
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/components/stringmirror.cxx b/vcl/source/components/stringmirror.cxx
index 6645335..2692bda 100644
--- a/vcl/source/components/stringmirror.cxx
+++ b/vcl/source/components/stringmirror.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.
@@ -121,3 +122,5 @@ Sequence< OUString > SAL_CALL StringMirror::getSupportedServiceNames() throw (Ru
}
} // namespace vcl
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/control/quickselectionengine.cxx b/vcl/source/control/quickselectionengine.cxx
index e63e2ba..7b6936a 100644
--- a/vcl/source/control/quickselectionengine.cxx
+++ b/vcl/source/control/quickselectionengine.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.
*
@@ -181,3 +182,5 @@ namespace vcl
//........................................................................
} // namespace vcl
//........................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/control/throbber.cxx b/vcl/source/control/throbber.cxx
index c840692..adec506 100644
--- a/vcl/source/control/throbber.cxx
+++ b/vcl/source/control/throbber.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.
@@ -323,3 +324,5 @@ IMPL_LINK( Throbber, TimeOutHdl, void*, EMPTYARG )
return 0;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx
index b5c1e16..76d5ba5 100644
--- a/vcl/source/gdi/pdfwriter_impl2.cxx
+++ b/vcl/source/gdi/pdfwriter_impl2.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.
@@ -2050,3 +2051,5 @@ void PDFWriterImpl::writeG4Stream( BitmapReadAccess* i_pBitmap )
rtl_freeMemory( pFirstRefLine );
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/gdi/rendergraphic.cxx b/vcl/source/gdi/rendergraphic.cxx
index 10b6064..7977116 100644
--- a/vcl/source/gdi/rendergraphic.cxx
+++ b/vcl/source/gdi/rendergraphic.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.
@@ -238,3 +239,5 @@ void RenderGraphic::ImplGetDefaults() const
}
} // VCL
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/gdi/rendergraphicrasterizer.cxx b/vcl/source/gdi/rendergraphicrasterizer.cxx
index 29c9863..4c70d86 100644
--- a/vcl/source/gdi/rendergraphicrasterizer.cxx
+++ b/vcl/source/gdi/rendergraphicrasterizer.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.
@@ -398,3 +399,5 @@ void RenderGraphicRasterizer::ImplUpdateCache( const RenderGraphicRasterizer& rR
}
} // VCL
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/gdi/svgread.cxx b/vcl/source/gdi/svgread.cxx
index 554cfa8..0573f92 100644
--- a/vcl/source/gdi/svgread.cxx
+++ b/vcl/source/gdi/svgread.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.
@@ -129,3 +130,5 @@ namespace vcl
}
} // namespace vcl
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/window/window4.cxx b/vcl/source/window/window4.cxx
index 38e41d0..fb41f87 100644
--- a/vcl/source/window/window4.cxx
+++ b/vcl/source/window/window4.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.
@@ -223,3 +224,4 @@ uno::Sequence< beans::PropertyValue > Window::getProperties() const
return aProps;
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/window/wpropset.cxx b/vcl/source/window/wpropset.cxx
index f5346ad..078efcc 100644
--- a/vcl/source/window/wpropset.cxx
+++ b/vcl/source/window/wpropset.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.
@@ -345,3 +346,5 @@ IMPL_LINK( vcl::WindowPropertySet, ChildEventListener, VclWindowEvent*, pEvent )
return 0;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/a11y/gtk3atkaction.cxx b/vcl/unx/gtk3/a11y/gtk3atkaction.cxx
index 71a92c8..80593f6 100644
--- a/vcl/unx/gtk3/a11y/gtk3atkaction.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atkaction.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* Version: MPL 1.1 / GPLv3+ / LGPLv3+
*
@@ -26,3 +27,5 @@
*/
#include "../../gtk/a11y/atkaction.cxx"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/a11y/gtk3atkbridge.cxx b/vcl/unx/gtk3/a11y/gtk3atkbridge.cxx
index 34d094f..f7babdb 100644
--- a/vcl/unx/gtk3/a11y/gtk3atkbridge.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atkbridge.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* Version: MPL 1.1 / GPLv3+ / LGPLv3+
*
@@ -26,3 +27,5 @@
*/
#include "../../gtk/a11y/atkbridge.cxx"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/a11y/gtk3atkcomponent.cxx b/vcl/unx/gtk3/a11y/gtk3atkcomponent.cxx
index cd33fcf..8c300b1 100644
--- a/vcl/unx/gtk3/a11y/gtk3atkcomponent.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atkcomponent.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* Version: MPL 1.1 / GPLv3+ / LGPLv3+
*
@@ -26,3 +27,5 @@
*/
#include "../../gtk/a11y/atkcomponent.cxx"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/a11y/gtk3atkeditabletext.cxx b/vcl/unx/gtk3/a11y/gtk3atkeditabletext.cxx
index 6ba2164..ae91ac3 100644
--- a/vcl/unx/gtk3/a11y/gtk3atkeditabletext.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atkeditabletext.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* Version: MPL 1.1 / GPLv3+ / LGPLv3+
*
@@ -26,3 +27,5 @@
*/
#include "../../gtk/a11y/atkeditabletext.cxx"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/a11y/gtk3atkfactory.cxx b/vcl/unx/gtk3/a11y/gtk3atkfactory.cxx
index 3fd107f..2a3c0dc 100644
--- a/vcl/unx/gtk3/a11y/gtk3atkfactory.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atkfactory.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* Version: MPL 1.1 / GPLv3+ / LGPLv3+
*
@@ -26,3 +27,5 @@
*/
#include "../../gtk/a11y/atkfactory.cxx"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/a11y/gtk3atkhypertext.cxx b/vcl/unx/gtk3/a11y/gtk3atkhypertext.cxx
index 2945882..f6b8cb6 100644
--- a/vcl/unx/gtk3/a11y/gtk3atkhypertext.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atkhypertext.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* Version: MPL 1.1 / GPLv3+ / LGPLv3+
*
@@ -26,3 +27,5 @@
*/
#include "../../gtk/a11y/atkhypertext.cxx"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/a11y/gtk3atkimage.cxx b/vcl/unx/gtk3/a11y/gtk3atkimage.cxx
index e8404b1..8167f6e 100644
--- a/vcl/unx/gtk3/a11y/gtk3atkimage.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atkimage.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* Version: MPL 1.1 / GPLv3+ / LGPLv3+
*
@@ -26,3 +27,5 @@
*/
#include "../../gtk/a11y/atkimage.cxx"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/a11y/gtk3atklistener.cxx b/vcl/unx/gtk3/a11y/gtk3atklistener.cxx
index a43aeab..76ad3ba 100644
--- a/vcl/unx/gtk3/a11y/gtk3atklistener.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atklistener.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* Version: MPL 1.1 / GPLv3+ / LGPLv3+
*
@@ -26,3 +27,5 @@
*/
#include "../../gtk/a11y/atklistener.cxx"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/a11y/gtk3atkregistry.cxx b/vcl/unx/gtk3/a11y/gtk3atkregistry.cxx
index 95c372a..3ad5551 100644
--- a/vcl/unx/gtk3/a11y/gtk3atkregistry.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atkregistry.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* Version: MPL 1.1 / GPLv3+ / LGPLv3+
*
@@ -26,3 +27,5 @@
*/
#include "../../gtk/a11y/atkregistry.cxx"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/a11y/gtk3atkselection.cxx b/vcl/unx/gtk3/a11y/gtk3atkselection.cxx
index 860e125..b233bbe 100644
--- a/vcl/unx/gtk3/a11y/gtk3atkselection.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atkselection.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* Version: MPL 1.1 / GPLv3+ / LGPLv3+
*
@@ -26,3 +27,5 @@
*/
#include "../../gtk/a11y/atkselection.cxx"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/a11y/gtk3atktable.cxx b/vcl/unx/gtk3/a11y/gtk3atktable.cxx
index 39dc5fc..bc0f473 100644
--- a/vcl/unx/gtk3/a11y/gtk3atktable.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atktable.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* Version: MPL 1.1 / GPLv3+ / LGPLv3+
*
@@ -26,3 +27,5 @@
*/
#include "../../gtk/a11y/atktable.cxx"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/a11y/gtk3atktext.cxx b/vcl/unx/gtk3/a11y/gtk3atktext.cxx
index 3239c66..f6f69af 100644
--- a/vcl/unx/gtk3/a11y/gtk3atktext.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atktext.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* Version: MPL 1.1 / GPLv3+ / LGPLv3+
*
@@ -26,3 +27,5 @@
*/
#include "../../gtk/a11y/atktext.cxx"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx b/vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx
index 61eeb47..85ecf50 100644
--- a/vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* Version: MPL 1.1 / GPLv3+ / LGPLv3+
*
@@ -26,3 +27,5 @@
*/
#include "../../gtk/a11y/atktextattributes.cxx"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/a11y/gtk3atkutil.cxx b/vcl/unx/gtk3/a11y/gtk3atkutil.cxx
index 44b41f6..183a33c 100644
--- a/vcl/unx/gtk3/a11y/gtk3atkutil.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atkutil.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* Version: MPL 1.1 / GPLv3+ / LGPLv3+
*
@@ -26,3 +27,5 @@
*/
#include "../../gtk/a11y/atkutil.cxx"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/a11y/gtk3atkvalue.cxx b/vcl/unx/gtk3/a11y/gtk3atkvalue.cxx
index 8398e0f..346d767 100644
--- a/vcl/unx/gtk3/a11y/gtk3atkvalue.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atkvalue.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* Version: MPL 1.1 / GPLv3+ / LGPLv3+
*
@@ -26,3 +27,5 @@
*/
#include "../../gtk/a11y/atkvalue.cxx"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/a11y/gtk3atkwindow.cxx b/vcl/unx/gtk3/a11y/gtk3atkwindow.cxx
index 3b11cf0..c93b0ff 100644
--- a/vcl/unx/gtk3/a11y/gtk3atkwindow.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atkwindow.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* Version: MPL 1.1 / GPLv3+ / LGPLv3+
*
@@ -26,3 +27,5 @@
*/
#include "../../gtk/a11y/atkwindow.cxx"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/a11y/gtk3atkwrapper.cxx b/vcl/unx/gtk3/a11y/gtk3atkwrapper.cxx
index 9a6c2e9..fbcecd3 100644
--- a/vcl/unx/gtk3/a11y/gtk3atkwrapper.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atkwrapper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* Version: MPL 1.1 / GPLv3+ / LGPLv3+
*
@@ -26,3 +27,5 @@
*/
#include "../../gtk/a11y/atkwrapper.cxx"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/app/gtk3gtkdata.cxx b/vcl/unx/gtk3/app/gtk3gtkdata.cxx
index a6d7a0e..01d5c59 100644
--- a/vcl/unx/gtk3/app/gtk3gtkdata.cxx
+++ b/vcl/unx/gtk3/app/gtk3gtkdata.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* Version: MPL 1.1 / GPLv3+ / LGPLv3+
*
@@ -26,3 +27,5 @@
*/
#include "../../gtk/app/gtkdata.cxx"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/app/gtk3gtkinst.cxx b/vcl/unx/gtk3/app/gtk3gtkinst.cxx
index ad2d59a..7d10b89 100644
--- a/vcl/unx/gtk3/app/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/app/gtk3gtkinst.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* Version: MPL 1.1 / GPLv3+ / LGPLv3+
*
@@ -26,3 +27,5 @@
*/
#include "../../gtk/app/gtkinst.cxx"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/app/gtk3gtksys.cxx b/vcl/unx/gtk3/app/gtk3gtksys.cxx
index ee769b3..8b103fa 100644
--- a/vcl/unx/gtk3/app/gtk3gtksys.cxx
+++ b/vcl/unx/gtk3/app/gtk3gtksys.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* Version: MPL 1.1 / GPLv3+ / LGPLv3+
*
@@ -26,3 +27,5 @@
*/
#include "../../gtk/app/gtksys.cxx"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index d6a181a..aa68cc2 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* Version: MPL 1.1 / GPLv3+ / LGPLv3+
*
@@ -28,3 +29,4 @@
#include "../../headless/svpdi.hxx"
#include "../../headless/svpdi.hxx"
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/window/gtk3gtkframe.cxx b/vcl/unx/gtk3/window/gtk3gtkframe.cxx
index a1d950e..47cbf2f 100644
--- a/vcl/unx/gtk3/window/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/window/gtk3gtkframe.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* Version: MPL 1.1 / GPLv3+ / LGPLv3+
*
@@ -26,3 +27,5 @@
*/
#include "../../gtk/window/gtkframe.cxx"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/window/gtk3gtkobject.cxx b/vcl/unx/gtk3/window/gtk3gtkobject.cxx
index ab16280..e91c849 100644
--- a/vcl/unx/gtk3/window/gtk3gtkobject.cxx
+++ b/vcl/unx/gtk3/window/gtk3gtkobject.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* Version: MPL 1.1 / GPLv3+ / LGPLv3+
*
@@ -26,3 +27,5 @@
*/
#include "../../gtk/window/gtkobject.cxx"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit fc310cf1b688c5afcb45f0e2af15e1b95fbb1cc9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jul 13 21:15:45 2011 +0100
callcatcher: remove unused ifdef branch
diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx
index 496dc77..a2646b5 100644
--- a/svtools/source/contnr/imivctl.hxx
+++ b/svtools/source/contnr/imivctl.hxx
@@ -609,7 +609,6 @@ public:
GridId GetGrid( sal_uInt16 nGridX, sal_uInt16 nGridY );
GridId GetUnoccupiedGrid( sal_Bool bOccupyFound=sal_True );
- void OccupyGrids( const Rectangle&, sal_Bool bOccupy = sal_True );
void OccupyGrids( const SvxIconChoiceCtrlEntry*, sal_Bool bOccupy = sal_True );
void OccupyGrid( GridId nId, sal_Bool bOccupy = sal_True )
{
diff --git a/svtools/source/contnr/imivctl2.cxx b/svtools/source/contnr/imivctl2.cxx
index 4007f70..3acbbf9 100644
--- a/svtools/source/contnr/imivctl2.cxx
+++ b/svtools/source/contnr/imivctl2.cxx
@@ -728,60 +728,11 @@ GridId IcnGridMap_Impl::GetUnoccupiedGrid( sal_Bool bOccupyFound )
// ein Eintrag belegt nur das unter seinem Zentrum liegende GridRect
// diese Variante ist bedeutend schneller als die Belegung ueber das
// Bounding-Rect, kann aber zu kleinen Ueberlappungen fuehren
-#define OCCUPY_CENTER
-
void IcnGridMap_Impl::OccupyGrids( const SvxIconChoiceCtrlEntry* pEntry, sal_Bool bOccupy )
{
if( !_pGridMap || !_pView->IsBoundingRectValid( pEntry->aRect ))
return;
-#ifndef OCCUPY_CENTER
- OccupyGrids( pEntry->aRect, bOccupy );
-#else
OccupyGrid( GetGrid( pEntry->aRect.Center()), bOccupy );
-#endif
-
-}
-
-void IcnGridMap_Impl::OccupyGrids( const Rectangle& rRect, sal_Bool bUsed )
-{
- if( !_pGridMap )
- return;
-
- if( bUsed )
- {
- if( _aLastOccupiedGrid == rRect )
- return;
- _aLastOccupiedGrid = rRect;
- }
- else
- _aLastOccupiedGrid.SetEmpty();
-
- sal_Bool bTopLeftClipped, bBottomRightClipped;
- GridId nIdTL = GetGrid( rRect.TopLeft(), &bTopLeftClipped );
- GridId nIdBR = GetGrid( rRect.BottomRight(), &bBottomRightClipped );
-
- if( bTopLeftClipped && bBottomRightClipped )
- return;
-
- sal_uInt16 nX1,nX2,nY1,nY2;
- GetGridCoord( nIdTL, nX1, nY1 );
- GetGridCoord( nIdBR, nX2, nY2 );
- sal_uInt16 nTemp;
- if( nX1 > nX2 )
- {
- nTemp = nX1;
- nX1 = nX2;
- nX2 = nTemp;
- }
- if( nY1 > nY2 )
- {
- nTemp = nY1;
- nY1 = nY2;
- nY2 = nTemp;
- }
- for( ; nX1 <= nX2; nX1++ )
- for( ; nY1 <= nY2; nY1++ )
- OccupyGrid( GetGrid( nX1, nY1 ) );
}
void IcnGridMap_Impl::Clear()
commit 5cb66730cab9c85a15c6252339fdff29892c5f97
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jul 13 21:13:29 2011 +0100
callcatcher: unused methods
diff --git a/tools/inc/tools/inetmime.hxx b/tools/inc/tools/inetmime.hxx
index a940712..059c34a 100644
--- a/tools/inc/tools/inetmime.hxx
+++ b/tools/inc/tools/inetmime.hxx
@@ -370,13 +370,6 @@ public:
*/
static sal_uInt32 getHexDigit(int nWeight);
- /** Get a Base 64 digit encoded as US-ASCII.
-
- @param nWeight Must be in the range 0--63, inclusive.
-
- @return The Base 64 digit corresponding to nWeight (US-ASCII 'A'--
- 'Z', 'a'--'z', '0'--'9', '+' or '/').
- */
static inline bool isHighSurrogate(sal_uInt32 nUTF16);
static inline bool isLowSurrogate(sal_uInt32 nUTF16);
commit b16c026684bed5e5034afa100f0d8f70065fccdf
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jul 13 21:10:35 2011 +0100
callcatcher: unused methods
diff --git a/svl/source/misc/inettype.cxx b/svl/source/misc/inettype.cxx
index b1386dd..c183f8c 100644
--- a/svl/source/misc/inettype.cxx
+++ b/svl/source/misc/inettype.cxx
@@ -828,13 +828,6 @@ MediaTypeEntry const * seekEntry(UniString const & rTypeName,
}
-//============================================================================
-//
-// INetContentTypes
-//
-//============================================================================
-
-//============================================================================
//static
INetContentType INetContentTypes::RegisterContentType(UniString const &
rTypeName,
commit f401c3ae1bc762b4d8acf42dd369b742f5e753be
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jul 13 21:07:19 2011 +0100
callcatcher: ditch unused method
diff --git a/l10ntools/inc/helpmerge.hxx b/l10ntools/inc/helpmerge.hxx
index 798b807..8cc08c7 100644
--- a/l10ntools/inc/helpmerge.hxx
+++ b/l10ntools/inc/helpmerge.hxx
@@ -79,7 +79,6 @@ private:
ByteString GetOutpath( const ByteString& rPathX , const ByteString& sCur , const ByteString& rPathY );
bool MergeSingleFile( XMLFile* file , MergeDataFile& aMergeDataFile , const ByteString& sLanguage , ByteString sPath );
- void Process( LangHashMap* aLangHM , const ByteString& sCur , ResData *pResData , MergeDataFile& aMergeDataFile );
void ProcessHelp( LangHashMap* aLangHM , const ByteString& sCur , ResData *pResData , MergeDataFile& aMergeDataFile );
void MakeDir( const ByteString& sPath );
};
diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx
index cf6a2a6..329b6d6 100644
--- a/l10ntools/source/helpmerge.cxx
+++ b/l10ntools/source/helpmerge.cxx
@@ -633,77 +633,5 @@ void HelpParser::ProcessHelp( LangHashMap* aLangHM , const ByteString& sCur , Re
}
}
-/* Process() Method merges */
-void HelpParser::Process( LangHashMap* aLangHM , const ByteString& sCur , ResData *pResData , MergeDataFile& aMergeDataFile ){
-
- XMLElement* pXMLElement = NULL;
- PFormEntrys *pEntrys = NULL;
- XMLData *data = NULL;
- XMLParentNode *parent = NULL;
- XMLDefault *xmldefault = NULL;
-
- short curLang = 0;
- String sNewdata;
- bool isFallback = false;
- ByteString sLId;
- ByteString sGId;
-
- pEntrys = NULL;
-
-#ifdef MERGE_SOURCE_LANGUAGES
- if( true ){ // Merge en-US!
-#else
- if( !sCur.EqualsIgnoreCaseAscii("en-US") ){
-#endif
- pXMLElement = (*aLangHM)[ sCur ];
- if( pXMLElement == NULL )
- {
- FillInFallbacks( *aLangHM , sCur );
- pXMLElement = ( *aLangHM )[ sCur ];
- isFallback = true;
- }
- if( pXMLElement != NULL )
- {
- parent = pXMLElement->GetParent();
- sLId = pXMLElement->GetOldref();
- pResData->sId = sLId;
-
- pEntrys = aMergeDataFile.GetPFormEntrys( pResData );
- if( pEntrys != NULL)
- {
- ByteString sNewText;
- pEntrys->GetText( sNewText, STRING_TYP_TEXT, sCur , true );
- sNewdata = String( sNewText , RTL_TEXTENCODING_UTF8 );
- if ( sNewdata.Len())
- {
- printf("Entries found\n");
- if( pXMLElement != NULL )
- {
- data = new XMLData( sNewdata , NULL , true ); // Add new one
- if( pXMLElement->ToOUString().compareTo( OUString(data->GetData()) ) != 0 )
- {
- pXMLElement->RemoveAndDeleteAllChilds();
- pXMLElement->AddChild( data );
- }
- if( isFallback )
- {
- xmldefault = new XMLDefault( String::CreateFromAscii("\n") , NULL );
- int pos = parent->GetPosition( pXMLElement->GetId() );
- if( pos != -1 ){
- parent->AddChild(xmldefault , pos+1 );
- parent->AddChild(pXMLElement , pos+2 );
- }
- else fprintf(stdout,"ERROR: Can't find reference Element of id %s language %d\n",pXMLElement->GetId().GetBuffer(),curLang);
- }
-
- aLangHM->erase( sCur );
- }
- }
- delete pResData;
- }else if( pResData == NULL ){fprintf(stdout,"Can't find GID=%s LID=%s TYP=%s\n",pResData->sGId.GetBuffer(),pResData->sId.GetBuffer(),pResData->sResTyp.GetBuffer());}
- }
-
- }
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 6e98af71cf0dfbf5423128e830c1e5d20503087a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jul 13 21:05:35 2011 +0100
set Dump methods to ultra-verbose debug-mode
diff --git a/l10ntools/inc/helpmerge.hxx b/l10ntools/inc/helpmerge.hxx
index 874a936..798b807 100644
--- a/l10ntools/inc/helpmerge.hxx
+++ b/l10ntools/inc/helpmerge.hxx
@@ -48,13 +48,13 @@ private:
/// @PRECOND 0 < langIdx_in < MAX_IDX
static void FillInFallbacks( LangHashMap& rElem_out, ByteString sLangIdx_in );
-/// Debugmethod, prints the content of the map to stdout
- static void Dump( LangHashMap* rElem_in , const ByteString sKey_in );
-
-/// Debugmethod, prints the content of the map to stdout
- static void Dump( XMLHashMap* rElem_in ) ;
-
+#if OSL_DEBUG_LEVEL > 2
+ /// Debugmethod, prints the content of the map to stdout
+ static void Dump(LangHashMap* rElem_in , const ByteString sKey_in);
+ /// Debugmethod, prints the content of the map to stdout
+ static void Dump(XMLHashMap* rElem_in);
+#endif
public:
HelpParser( const ByteString &rHelpFile, bool bUTF8 , bool bHasInputList );
diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx
index 9cf42c0..cf6a2a6 100644
--- a/l10ntools/source/helpmerge.cxx
+++ b/l10ntools/source/helpmerge.cxx
@@ -88,26 +88,29 @@ void HelpParser::FillInFallbacks( LangHashMap& rElem_out, ByteString sLangIdx_in
}
}
-/*****************************************************************************/
-void HelpParser::Dump(XMLHashMap* rElem_in) {
-/*****************************************************************************/
- for(XMLHashMap::iterator pos = rElem_in->begin();pos != rElem_in->end(); ++pos){
+#if OSL_DEBUG_LEVEL > 2
+void HelpParser::Dump(XMLHashMap* rElem_in)
+{
+ for(XMLHashMap::iterator pos = rElem_in->begin();pos != rElem_in->end(); ++pos)
+ {
Dump(pos->second,pos->first);
}
}
-/*****************************************************************************/
-void HelpParser::Dump(LangHashMap* rElem_in,const ByteString sKey_in) {
-/*****************************************************************************/
+
+void HelpParser::Dump(LangHashMap* rElem_in,const ByteString sKey_in)
+{
ByteString x;
OString y;
fprintf(stdout,"+------------%s-----------+\n",sKey_in.GetBuffer() );
- for(LangHashMap::iterator posn=rElem_in->begin();posn!=rElem_in->end();++posn){
+ for(LangHashMap::iterator posn=rElem_in->begin();posn!=rElem_in->end();++posn)
+ {
x=posn->first;
y=posn->second->ToOString();
fprintf(stdout,"key=%s value=%s\n",x.GetBuffer(),y.getStr());
}
fprintf(stdout,"+--------------------------+\n");
}
+#endif
HelpParser::HelpParser( const ByteString &rHelpFile, bool rUTF8 , bool rHasInputList )
: sHelpFile( rHelpFile ),
@@ -436,9 +439,11 @@ bool HelpParser::MergeSingleFile( XMLFile* file , MergeDataFile& aMergeDataFile
{
aLangHM = pos->second;
- //printf("*********************DUMPING HASHMAP***************************************");
- //Dump( aXMLStrHM );
- //printf("DBG: sHelpFile = %s\n",sHelpFile.GetBuffer() );
+#if OSL_DEBUG_LEVEL > 2
+ printf("*********************DUMPING HASHMAP***************************************");
+ Dump(aXMLStrHM);
+ printf("DBG: sHelpFile = %s\n",sHelpFile.GetBuffer() );
+#endif
pResData.sGId = pos->first;
pResData.sFilename = sHelpFile;
commit 0f4c00e65dd78fd1dd39a763035e74b49b9b9192
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jul 13 20:55:00 2011 +0100
callcatcher: drop unused help methods
diff --git a/vcl/inc/vcl/help.hxx b/vcl/inc/vcl/help.hxx
index 3168da7..a7ad25d 100644
--- a/vcl/inc/vcl/help.hxx
+++ b/vcl/inc/vcl/help.hxx
@@ -86,14 +86,12 @@ public:
static void EnableContextHelp();
static void DisableContextHelp();
static sal_Bool IsContextHelpEnabled();
- static sal_Bool StartContextHelp();
static void EnableExtHelp();
static void DisableExtHelp();
static sal_Bool IsExtHelpEnabled();
static sal_Bool StartExtHelp();
static sal_Bool EndExtHelp();
- static sal_Bool IsExtHelpActive();
static void EnableBalloonHelp();
static void DisableBalloonHelp();
diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx
index 48a8b14..3bc17b0 100644
--- a/vcl/source/app/help.cxx
+++ b/vcl/source/app/help.cxx
@@ -112,27 +112,6 @@ sal_Bool Help::IsContextHelpEnabled()
// -----------------------------------------------------------------------
-sal_Bool Help::StartContextHelp()
-{
- ImplSVData* pSVData = ImplGetSVData();
-
- if ( pSVData->maHelpData.mbContextHelp )
- {
- Window* pWindow = pSVData->maWinData.mpFocusWin;
- if ( pWindow )
- {
- Point aMousePos = pWindow->OutputToScreenPixel( pWindow->GetPointerPosPixel() );
- HelpEvent aHelpEvent( aMousePos, HELPMODE_CONTEXT );
- pWindow->RequestHelp( aHelpEvent );
- return sal_True;
- }
- }
-
- return sal_False;
-}
-
-// -----------------------------------------------------------------------
-
void Help::EnableExtHelp()
{
ImplGetSVData()->maHelpData.mbExtHelp = sal_True;
@@ -191,13 +170,6 @@ sal_Bool Help::EndExtHelp()
// -----------------------------------------------------------------------
-sal_Bool Help::IsExtHelpActive()
-{
- return ImplGetSVData()->maHelpData.mbExtHelpMode;
-}
-
-// -----------------------------------------------------------------------
-
void Help::EnableBalloonHelp()
{
ImplGetSVData()->maHelpData.mbBalloonHelp = sal_True;
More information about the Libreoffice-commits
mailing list