[Libreoffice-commits] core.git: desktop/source desktop/util desktop/win32
Alexander Wilms
f.alexander.wilms at gmail.com
Thu Feb 27 04:00:03 PST 2014
desktop/source/app/app.cxx | 12 ++--
desktop/source/app/configinit.hxx | 2
desktop/source/deployment/dp_log.cxx | 2
desktop/source/deployment/dp_xml.cxx | 2
desktop/source/deployment/gui/dp_gui.h | 2
desktop/source/deployment/gui/dp_gui_dialog2.cxx | 4 -
desktop/source/deployment/gui/dp_gui_dialog2.hxx | 12 ++--
desktop/source/deployment/gui/dp_gui_dialog2.src | 4 -
desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx | 2
desktop/source/deployment/gui/dp_gui_extlistbox.hxx | 20 +++----
desktop/source/deployment/gui/dp_gui_service.cxx | 4 -
desktop/source/deployment/gui/dp_gui_theextmgr.hxx | 10 +--
desktop/source/deployment/gui/dp_gui_updatedata.hxx | 4 -
desktop/source/deployment/gui/license_dialog.cxx | 4 -
desktop/source/deployment/inc/dp_interact.h | 16 ++---
desktop/source/deployment/inc/dp_misc.h | 22 +++----
desktop/source/deployment/inc/dp_resource.h | 6 +-
desktop/source/deployment/inc/dp_ucb.h | 10 +--
desktop/source/deployment/inc/dp_xml.h | 2
desktop/source/deployment/manager/dp_commandenvironments.cxx | 6 +-
desktop/source/deployment/manager/dp_manager.h | 6 +-
desktop/source/deployment/manager/dp_managerfac.cxx | 4 -
desktop/source/deployment/misc/dp_descriptioninfoset.cxx | 2
desktop/source/deployment/misc/dp_interact.cxx | 6 +-
desktop/source/deployment/misc/dp_misc.cxx | 16 ++---
desktop/source/deployment/misc/dp_platform.cxx | 2
desktop/source/deployment/misc/dp_resource.cxx | 6 +-
desktop/source/deployment/misc/dp_ucb.cxx | 10 +--
desktop/source/deployment/registry/component/dp_component.cxx | 2
desktop/source/deployment/registry/configuration/dp_configuration.cxx | 2
desktop/source/deployment/registry/dp_registry.cxx | 4 -
desktop/source/deployment/registry/help/dp_help.cxx | 2
desktop/source/deployment/registry/inc/dp_backend.h | 4 -
desktop/source/deployment/registry/package/dp_package.cxx | 4 -
desktop/source/deployment/registry/script/dp_lib_container.h | 2
desktop/source/deployment/registry/sfwk/dp_sfwk.cxx | 2
desktop/source/migration/migration_impl.hxx | 6 +-
desktop/source/migration/services/basicmigration.cxx | 20 +++----
desktop/source/migration/services/basicmigration.hxx | 12 ++--
desktop/source/migration/services/misc.hxx | 8 +-
desktop/source/migration/services/oo3extensionmigration.cxx | 12 ++--
desktop/source/migration/services/oo3extensionmigration.hxx | 8 +-
desktop/source/migration/services/wordbookmigration.cxx | 20 +++----
desktop/source/migration/services/wordbookmigration.hxx | 12 ++--
desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx | 4 -
desktop/source/pkgchk/unopkg/unopkg_misc.cxx | 18 +++---
desktop/source/pkgchk/unopkg/unopkg_shared.h | 28 +++++-----
desktop/util/officeloader.rc | 4 -
desktop/win32/source/QuickStart/QuickStart.cxx | 2
desktop/win32/source/QuickStart/StdAfx.h | 2
desktop/win32/source/applauncher/launcher.rc | 4 -
desktop/win32/source/guistdio/guistdio.inc | 20 +++----
52 files changed, 200 insertions(+), 200 deletions(-)
New commits:
commit 2991d2d65bf8b99d82d1f7d209332d0c303dff21
Author: Alexander Wilms <f.alexander.wilms at gmail.com>
Date: Tue Feb 25 18:19:04 2014 +0100
Remove visual noise from desktop
Change-Id: Ib8ca7794ce6f3e96ee3a9b2896b141635665552c
Reviewed-on: https://gerrit.libreoffice.org/8252
Tested-by: Caolán McNamara <caolanm at redhat.com>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 91b3157..402dbb2 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -454,7 +454,7 @@ OUString MakeStartupConfigAccessErrorMessage( OUString const & aInternalErrMsg )
return aDiagnosticMessage.makeStringAndClear();
}
-//=============================================================================
+
// shows a simple error box with the given message ... but exits from these process !
// Fatal errors cant be solved by the process ... nor any recovery can help.
// Mostly the installation was damaged and must be repaired manually .. or by calling
@@ -463,7 +463,7 @@ OUString MakeStartupConfigAccessErrorMessage( OUString const & aInternalErrMsg )
// the current office process ! No pipe requests, no menu/toolbar/shortuct actions
// are allowed. Otherwise we will force a "crash inside a crash".
// Thats why we have to use a special native message box here which does not use yield :-)
-//=============================================================================
+
void FatalError(const OUString& sMessage)
{
OUString sProductKey = ::utl::Bootstrap::getProductKey();
@@ -1939,14 +1939,14 @@ void Desktop::OverrideSystemSettings( AllSettings& rSettings )
rSettings.SetStyleSettings ( hStyleSettings );
}
-// ========================================================================
+
IMPL_LINK_NOARG(Desktop, AsyncInitFirstRun)
{
DoFirstRunInitializations();
return 0L;
}
-// ========================================================================
+
class ExitTimer : public Timer
{
@@ -2805,7 +2805,7 @@ void Desktop::CloseSplashScreen()
}
}
-// ========================================================================
+
void Desktop::DoFirstRunInitializations()
{
try
@@ -2867,7 +2867,7 @@ void Desktop::ShowBackingComponent(Desktop * progress)
}
}
-// ========================================================================
+
void Desktop::CheckFirstRun( )
{
if (officecfg::Office::Common::Misc::FirstRun::get())
diff --git a/desktop/source/app/configinit.hxx b/desktop/source/app/configinit.hxx
index 3c2cb53..eaaa6d1 100644
--- a/desktop/source/app/configinit.hxx
+++ b/desktop/source/app/configinit.hxx
@@ -61,7 +61,7 @@
void operator=(const ConfigurationErrorHandler&);
};
-//-----------------------------------------------------------------------------
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/dp_log.cxx b/desktop/source/deployment/dp_log.cxx
index 80bf625..9c92b8d 100644
--- a/desktop/source/deployment/dp_log.cxx
+++ b/desktop/source/deployment/dp_log.cxx
@@ -41,7 +41,7 @@ namespace dp_log {
typedef ::cppu::WeakComponentImplHelper1<ucb::XProgressHandler> t_log_helper;
-//==============================================================================
+
class ProgressLogImpl : public ::dp_misc::MutexHolder, public t_log_helper
{
Reference<io::XOutputStream> m_xLogFile;
diff --git a/desktop/source/deployment/dp_xml.cxx b/desktop/source/deployment/dp_xml.cxx
index 9fd60fc..8b4e13d 100644
--- a/desktop/source/deployment/dp_xml.cxx
+++ b/desktop/source/deployment/dp_xml.cxx
@@ -31,7 +31,7 @@ using namespace ::com::sun::star::uno;
namespace dp_misc
{
-//==============================================================================
+
void xml_parse(
Reference<xml::sax::XDocumentHandler> const & xDocHandler,
::ucbhelper::Content & ucb_content,
diff --git a/desktop/source/deployment/gui/dp_gui.h b/desktop/source/deployment/gui/dp_gui.h
index f876205..18b9ea0 100644
--- a/desktop/source/deployment/gui/dp_gui.h
+++ b/desktop/source/deployment/gui/dp_gui.h
@@ -63,7 +63,7 @@ namespace dp_gui {
enum PackageState { REGISTERED, NOT_REGISTERED, AMBIGUOUS, NOT_AVAILABLE };
-//==============================================================================
+
class SelectedPackage: public salhelper::SimpleReferenceObject {
public:
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index b345c3a..aa79edf 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -1714,9 +1714,9 @@ ShowLicenseDialog::ShowLicenseDialog( Window * pParent,
m_pLicenseText->SetText(xPackage->getLicenseText());
}
-//=================================================================================
+
// UpdateRequiredDialogService
-//=================================================================================
+
UpdateRequiredDialogService::UpdateRequiredDialogService( uno::Sequence< uno::Any > const&,
uno::Reference< uno::XComponentContext > const& xComponentContext )
: m_xComponentContext( xComponentContext )
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
index 56bd021..b21776f 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
@@ -45,12 +45,12 @@
namespace dp_gui {
-//==============================================================================
+
class ExtBoxWithBtns_Impl;
class ExtensionBox_Impl;
class TheExtensionManager;
-//==============================================================================
+
class DialogHelper
{
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
@@ -94,7 +94,7 @@ public:
bool installForAllUsers( bool &bInstallForAll ) const;
};
-//==============================================================================
+
class ExtMgrDialog : public ModelessDialog,
public DialogHelper
{
@@ -168,7 +168,7 @@ public:
::com::sun::star::uno::Sequence< OUString > raiseAddPicker();
};
-//==============================================================================
+
class UpdateRequiredDialog : public ModalDialog,
public DialogHelper
{
@@ -239,7 +239,7 @@ public:
bool installExtensionWarn( const OUString &rExtensionURL ) const;
};
-//==============================================================================
+
class ShowLicenseDialog : public ModalDialog
{
VclMultiLineEdit* m_pLicenseText;
@@ -247,7 +247,7 @@ public:
ShowLicenseDialog(Window * pParent, const css::uno::Reference< css::deployment::XPackage > &xPackage);
};
-//==============================================================================
+
class UpdateRequiredDialogService : public ::cppu::WeakImplHelper1< ::com::sun::star::ui::dialogs::XExecutableDialog >
{
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const m_xComponentContext;
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.src b/desktop/source/deployment/gui/dp_gui_dialog2.src
index c793a34..971d149 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.src
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.src
@@ -111,13 +111,13 @@ QueryBox RID_QUERYBOX_INSTALL_FOR_ALL
// Dialog layout
-// ---------------------------------------------------
+
// row 1 | multi line edit
// ---------------------------------------------------
// row 2 | fixed text
// ---------------------------------------------------
// row 3 | img | fixed text | fixed text | button
-// ----------------------------------------------------
+// ---------------------------------------------------
// row 4 | img | fixed text | fixed text
// ---------------------------------------------------
// row 5 |fixed line
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
index d62d4a5..65e3f8c 100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
@@ -111,7 +111,7 @@ OUString getVersion( const uno::Reference< deployment::XPackage > &rPackage )
namespace dp_gui {
-//==============================================================================
+
class ProgressCmdEnv
: public ::cppu::WeakImplHelper3< ucb::XCommandEnvironment,
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
index b1fac34..6358369 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
@@ -47,9 +47,9 @@ class TheExtensionManager;
typedef ::boost::shared_ptr< FixedHyperlink > TFixedHyperlink;
-//------------------------------------------------------------------------------
+
// struct Entry_Impl
-//------------------------------------------------------------------------------
+
struct Entry_Impl;
typedef ::boost::shared_ptr< Entry_Impl > TEntry_Impl;
@@ -88,13 +88,13 @@ struct Entry_Impl
void checkDependencies();
};
-//------------------------------------------------------------------------------
+
// class ExtensionBox_Impl
-//------------------------------------------------------------------------------
+
class ExtensionBox_Impl;
-//------------------------------------------------------------------------------
+
class ExtensionRemovedListener : public ::cppu::WeakImplHelper1< ::com::sun::star::lang::XEventListener >
{
ExtensionBox_Impl *m_pParent;
@@ -104,13 +104,13 @@ public:
ExtensionRemovedListener( ExtensionBox_Impl *pParent ) { m_pParent = pParent; }
~ExtensionRemovedListener();
- //===================================================================================
+
// XEventListener
virtual void SAL_CALL disposing( ::com::sun::star::lang::EventObject const & evt )
throw (::com::sun::star::uno::RuntimeException, std::exception);
};
-//------------------------------------------------------------------------------
+
class ExtensionBox_Impl : public ::svt::IExtensionListBox
{
bool m_bHasScrollBar;
@@ -169,7 +169,7 @@ class ExtensionBox_Impl : public ::svt::IExtensionListBox
bool FindEntryPos( const TEntry_Impl pEntry, long nStart, long nEnd, long &nFound );
void DeleteRemoved();
- //-----------------
+
DECL_DLLPRIVATE_LINK( ScrollHdl, ScrollBar * );
//Index starts with 1.
@@ -201,7 +201,7 @@ public:
virtual void RecalcAll();
void RemoveUnlocked();
- //-----------------
+
virtual void selectEntry( const long nPos );
long addEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage,
bool bLicenseMissing = false );
@@ -214,7 +214,7 @@ public:
TheExtensionManager* getExtensionManager() const { return m_pManager; }
void setExtensionManager(TheExtensionManager* pManager) { m_pManager = pManager; }
- //===================================================================================
+
//These functions are used for automatic testing
/** @return The count of the entries in the list box. */
diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx
index 7b2d392..94869d0 100644
--- a/desktop/source/deployment/gui/dp_gui_service.cxx
+++ b/desktop/source/deployment/gui/dp_gui_service.cxx
@@ -48,7 +48,7 @@ using namespace ::com::sun::star::uno;
namespace dp_gui {
-//==============================================================================
+
class MyApp : public Application, private boost::noncopyable
{
public:
@@ -136,7 +136,7 @@ OUString ReplaceProductNameHookProc( const OUString& rStr )
return sRet;
}
-//==============================================================================
+
class ServiceImpl
: public ::cppu::WeakImplHelper2<ui::dialogs::XAsynchronousExecutableDialog,
task::XJobExecutor>
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
index 43262ee..d0aa7f7 100644
--- a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
+++ b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
@@ -36,13 +36,13 @@
#include "dp_gui_dialog2.hxx"
#include "dp_gui_updatedata.hxx"
-//==============================================================================
+
namespace dp_gui {
-//------------------------------------------------------------------------------
+
class ExtensionCmdQueue;
-//------------------------------------------------------------------------------
+
class TheExtensionManager :
public ::cppu::WeakImplHelper2< ::com::sun::star::frame::XTerminateListener,
::com::sun::star::util::XModifyListener >
@@ -80,7 +80,7 @@ public:
bool Close();
bool isVisible();
- //-----------------
+
bool checkUpdates( bool showUpdateOnly, bool parentVisible );
bool installPackage( const OUString &rPackageURL, bool bWarnUser = false );
void createPackageList();
@@ -95,7 +95,7 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::deployment::XExtensionManager > getExtensionManager() const { return m_xExtensionManager; }
bool isReadOnly( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage ) const;
- //-----------------
+
static ::rtl::Reference<TheExtensionManager> get(
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> const & xContext,
::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow> const & xParent = 0,
diff --git a/desktop/source/deployment/gui/dp_gui_updatedata.hxx b/desktop/source/deployment/gui/dp_gui_updatedata.hxx
index 42bda36..1e45094 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedata.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedata.hxx
@@ -54,7 +54,7 @@ struct UpdateData
OUString updateVersion;
//For online update
- // ======================
+
// The content of the update information.
//Only if aUpdateInfo is set then there is an online update available with a better version
//than any of the currently installed extensions with the same identifier.
@@ -66,7 +66,7 @@ struct UpdateData
OUString sWebsiteURL;
//For local update
- //=====================
+
//The locale extension which is used as update for the user or shared repository.
//If set then the data for the online update (aUpdateInfo, sLocalURL, sWebsiteURL)
//are to be ignored.
diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx
index 90b5f32..39a2dd3 100644
--- a/desktop/source/deployment/gui/license_dialog.cxx
+++ b/desktop/source/deployment/gui/license_dialog.cxx
@@ -181,7 +181,7 @@ void LicenseView::Notify( SfxBroadcaster&, const SfxHint& rHint )
}
}
-//==============================================================================================================
+
LicenseDialogImpl::LicenseDialogImpl(
Window * pParent,
@@ -281,7 +281,7 @@ IMPL_LINK_NOARG(LicenseDialogImpl, EndReachedHdl)
return 0;
}
-//=================================================================================
+
diff --git a/desktop/source/deployment/inc/dp_interact.h b/desktop/source/deployment/inc/dp_interact.h
index 1d65128..12a9849 100644
--- a/desktop/source/deployment/inc/dp_interact.h
+++ b/desktop/source/deployment/inc/dp_interact.h
@@ -43,7 +43,7 @@ inline void progressUpdate(
}
}
-//==============================================================================
+
class ProgressLevel
{
css::uno::Reference<css::ucb::XProgressHandler> m_xProgressHandler;
@@ -58,7 +58,7 @@ public:
inline void update( css::uno::Any const & status ) const;
};
-//______________________________________________________________________________
+
inline ProgressLevel::ProgressLevel(
css::uno::Reference< css::ucb::XCommandEnvironment > const & xCmdEnv,
OUString const & status )
@@ -69,28 +69,28 @@ inline ProgressLevel::ProgressLevel(
m_xProgressHandler->push( css::uno::makeAny(status) );
}
-//______________________________________________________________________________
+
inline ProgressLevel::~ProgressLevel()
{
if (m_xProgressHandler.is())
m_xProgressHandler->pop();
}
-//______________________________________________________________________________
+
inline void ProgressLevel::update( OUString const & status ) const
{
if (m_xProgressHandler.is())
m_xProgressHandler->update( css::uno::makeAny(status) );
}
-//______________________________________________________________________________
+
inline void ProgressLevel::update( css::uno::Any const & status ) const
{
if (m_xProgressHandler.is())
m_xProgressHandler->update( status );
}
-//##############################################################################
+
/** @return true if ia handler is present and any selection has been chosen
*/
@@ -100,9 +100,9 @@ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC bool interactContinuation(
css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv,
bool * pcont, bool * pabort );
-//##############################################################################
-//==============================================================================
+
+
class DESKTOP_DEPLOYMENTMISC_DLLPUBLIC AbortChannel :
public ::cppu::WeakImplHelper1<css::task::XAbortChannel>
{
diff --git a/desktop/source/deployment/inc/dp_misc.h b/desktop/source/deployment/inc/dp_misc.h
index 9c09219..fc7aa8b 100644
--- a/desktop/source/deployment/inc/dp_misc.h
+++ b/desktop/source/deployment/inc/dp_misc.h
@@ -39,7 +39,7 @@ namespace dp_misc {
const sal_Char CR = 0x0d;
const sal_Char LF = 0x0a;
-//==============================================================================
+
class MutexHolder
{
mutable ::osl::Mutex m_mutex;
@@ -47,7 +47,7 @@ protected:
inline ::osl::Mutex & getMutex() const { return m_mutex; }
};
-//==============================================================================
+
inline void try_dispose( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> const & x )
{
::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent> xComp( x, ::com::sun::star::uno::UNO_QUERY );
@@ -55,20 +55,20 @@ inline void try_dispose( ::com::sun::star::uno::Reference< ::com::sun::star::uno
xComp->dispose();
}
-//##############################################################################
-//==============================================================================
+
+
DESKTOP_DEPLOYMENTMISC_DLLPUBLIC
OUString expandUnoRcTerm( OUString const & term );
DESKTOP_DEPLOYMENTMISC_DLLPUBLIC
OUString makeRcTerm( OUString const & url );
-//==============================================================================
+
DESKTOP_DEPLOYMENTMISC_DLLPUBLIC
OUString expandUnoRcUrl( OUString const & url );
-//==============================================================================
+
/** appends a relative path to a url.
@@ -88,26 +88,26 @@ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC OUString makeURL(
DESKTOP_DEPLOYMENTMISC_DLLPUBLIC OUString makeURLAppendSysPathSegment(
OUString const & baseURL, OUString const & relPath );
-//==============================================================================
+
DESKTOP_DEPLOYMENTMISC_DLLPUBLIC OUString generateRandomPipeId();
class AbortChannel;
-//==============================================================================
+
DESKTOP_DEPLOYMENTMISC_DLLPUBLIC
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> resolveUnoURL(
OUString const & connectString,
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> const & xLocalContext,
AbortChannel * abortChannel = 0 );
-//==============================================================================
+
DESKTOP_DEPLOYMENTMISC_DLLPUBLIC bool office_is_running();
-//==============================================================================
+
DESKTOP_DEPLOYMENTMISC_DLLPUBLIC
oslProcess raiseProcess( OUString const & appURL,
::com::sun::star::uno::Sequence< OUString > const & args );
-//==============================================================================
+
/** writes the argument string to the console.
On Linux/Unix/etc. it converts the UTF16 string to an ANSI string using
diff --git a/desktop/source/deployment/inc/dp_resource.h b/desktop/source/deployment/inc/dp_resource.h
index f1390ad5..622ba17 100644
--- a/desktop/source/deployment/inc/dp_resource.h
+++ b/desktop/source/deployment/inc/dp_resource.h
@@ -27,10 +27,10 @@
namespace dp_misc {
-//==============================================================================
+
ResId getResId( sal_uInt16 id );
-//==============================================================================
+
DESKTOP_DEPLOYMENTMISC_DLLPUBLIC OUString getResourceString( sal_uInt16 id );
template <typename Unique, sal_uInt16 id>
@@ -39,7 +39,7 @@ struct StaticResourceString :
const OUString operator () () { return getResourceString(id); }
};
-//==============================================================================
+
DESKTOP_DEPLOYMENTMISC_DLLPUBLIC
const LanguageTag & getOfficeLanguageTag();
diff --git a/desktop/source/deployment/inc/dp_ucb.h b/desktop/source/deployment/inc/dp_ucb.h
index 32f8cd4d..3ef3eb6 100644
--- a/desktop/source/deployment/inc/dp_ucb.h
+++ b/desktop/source/deployment/inc/dp_ucb.h
@@ -58,14 +58,14 @@ struct DESKTOP_DEPLOYMENTMISC_DLLPUBLIC StrTitle
}
};
-//==============================================================================
+
DESKTOP_DEPLOYMENTMISC_DLLPUBLIC bool create_ucb_content(
::ucbhelper::Content * ucb_content,
OUString const & url,
css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv,
bool throw_exc = true );
-//==============================================================================
+
/** @return true if previously non-existing folder has been created
*/
DESKTOP_DEPLOYMENTMISC_DLLPUBLIC bool create_folder(
@@ -74,17 +74,17 @@ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC bool create_folder(
css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv,
bool throw_exc = true );
-//==============================================================================
+
DESKTOP_DEPLOYMENTMISC_DLLPUBLIC bool erase_path(
OUString const & url,
css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv,
bool throw_exc = true );
-//==============================================================================
+
DESKTOP_DEPLOYMENTMISC_DLLPUBLIC
::rtl::ByteSequence readFile( ::ucbhelper::Content & ucb_content );
-//==============================================================================
+
DESKTOP_DEPLOYMENTMISC_DLLPUBLIC
bool readLine( OUString * res, OUString const & startingWith,
::ucbhelper::Content & ucb_content, rtl_TextEncoding textenc );
diff --git a/desktop/source/deployment/inc/dp_xml.h b/desktop/source/deployment/inc/dp_xml.h
index d32b8a1..a5c96ec 100644
--- a/desktop/source/deployment/inc/dp_xml.h
+++ b/desktop/source/deployment/inc/dp_xml.h
@@ -36,7 +36,7 @@ class Content;
namespace dp_misc
{
-//==============================================================================
+
void xml_parse(
css::uno::Reference< css::xml::sax::XDocumentHandler > const & xDocHandler,
::ucbhelper::Content & ucb_content,
diff --git a/desktop/source/deployment/manager/dp_commandenvironments.cxx b/desktop/source/deployment/manager/dp_commandenvironments.cxx
index fc00167..99e2522 100644
--- a/desktop/source/deployment/manager/dp_commandenvironments.cxx
+++ b/desktop/source/deployment/manager/dp_commandenvironments.cxx
@@ -131,7 +131,7 @@ throw (uno::RuntimeException, std::exception)
void BaseCommandEnv::pop() throw (uno::RuntimeException, std::exception)
{
}
-//==============================================================================
+
TmpRepositoryCommandEnv::TmpRepositoryCommandEnv()
{
@@ -166,7 +166,7 @@ void TmpRepositoryCommandEnv::handle(
handle_(approve, abort, xRequest);
}
-//================================================================================
+
LicenseCommandEnv::LicenseCommandEnv(
css::uno::Reference< css::task::XInteractionHandler> const & handler,
@@ -206,7 +206,7 @@ void LicenseCommandEnv::handle(
handle_(approve, abort, xRequest);
}
-//================================================================================
+
NoLicenseCommandEnv::NoLicenseCommandEnv(
css::uno::Reference< css::task::XInteractionHandler> const & handler):
diff --git a/desktop/source/deployment/manager/dp_manager.h b/desktop/source/deployment/manager/dp_manager.h
index 1f12b33..2c53571 100644
--- a/desktop/source/deployment/manager/dp_manager.h
+++ b/desktop/source/deployment/manager/dp_manager.h
@@ -38,7 +38,7 @@ namespace dp_manager {
typedef ::cppu::WeakComponentImplHelper1<
css::deployment::XPackageManager > t_pm_helper;
-//==============================================================================
+
class PackageManagerImpl : private ::dp_misc::MutexHolder, public t_pm_helper
{
css::uno::Reference<css::uno::XComponentContext> m_xComponentContext;
@@ -262,7 +262,7 @@ public:
css::uno::RuntimeException, std::exception);
};
-//______________________________________________________________________________
+
inline void PackageManagerImpl::check()
{
::osl::MutexGuard guard( getMutex() );
@@ -272,7 +272,7 @@ inline void PackageManagerImpl::check()
static_cast< ::cppu::OWeakObject * >(this) );
}
-//______________________________________________________________________________
+
inline void PackageManagerImpl::logIntern( css::uno::Any const & status )
{
if (m_xLogFile.is())
diff --git a/desktop/source/deployment/manager/dp_managerfac.cxx b/desktop/source/deployment/manager/dp_managerfac.cxx
index 75e41fd..1a88fd0 100644
--- a/desktop/source/deployment/manager/dp_managerfac.cxx
+++ b/desktop/source/deployment/manager/dp_managerfac.cxx
@@ -36,7 +36,7 @@ namespace factory {
typedef ::cppu::WeakComponentImplHelper1<
deployment::XPackageManagerFactory > t_pmfac_helper;
-//==============================================================================
+
class PackageManagerFactoryImpl : private MutexHolder, public t_pmfac_helper
{
Reference<XComponentContext> m_xComponentContext;
@@ -65,7 +65,7 @@ public:
OUString const & context ) throw (RuntimeException, std::exception);
};
-//==============================================================================
+
namespace sdecl = comphelper::service_decl;
sdecl::class_<PackageManagerFactoryImpl> servicePMFI;
extern sdecl::ServiceDecl const serviceDecl(
diff --git a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
index d7763a0..67b6d8e 100644
--- a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
+++ b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
@@ -255,7 +255,7 @@ ExtensionDescription::~ExtensionDescription()
{
}
-//======================================================================
+
FileDoesNotExistFilter::FileDoesNotExistFilter(
const Reference< css::ucb::XCommandEnvironment >& xCmdEnv):
m_bExist(true), m_xCommandEnv(xCmdEnv)
diff --git a/desktop/source/deployment/misc/dp_interact.cxx b/desktop/source/deployment/misc/dp_interact.cxx
index 88285d8..f895e0f 100644
--- a/desktop/source/deployment/misc/dp_interact.cxx
+++ b/desktop/source/deployment/misc/dp_interact.cxx
@@ -31,7 +31,7 @@ using namespace ::com::sun::star::ucb;
namespace dp_misc {
namespace {
-//==============================================================================
+
class InteractionContinuationImpl : public ::cppu::OWeakObject,
public task::XInteractionContinuation
{
@@ -89,7 +89,7 @@ void InteractionContinuationImpl::select() throw (RuntimeException, std::excepti
*m_pselect = true;
}
-//==============================================================================
+
class InteractionRequest :
public ::cppu::WeakImplHelper1<task::XInteractionRequest>
{
@@ -127,7 +127,7 @@ InteractionRequest::getContinuations() throw (RuntimeException, std::exception)
} // anon namespace
-//==============================================================================
+
bool interactContinuation( Any const & request,
Type const & continuation,
Reference<XCommandEnvironment> const & xCmdEnv,
diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx
index d895af8..4186bb1 100644
--- a/desktop/source/deployment/misc/dp_misc.cxx
+++ b/desktop/source/deployment/misc/dp_misc.cxx
@@ -236,7 +236,7 @@ bool needToSyncRepository(OUString const & name)
} // anon namespace
-//==============================================================================
+
namespace {
inline OUString encodeForRcFile( OUString const & str )
@@ -261,7 +261,7 @@ inline OUString encodeForRcFile( OUString const & str )
}
}
-//==============================================================================
+
OUString makeURL( OUString const & baseURL, OUString const & relPath_ )
{
OUStringBuffer buf;
@@ -305,7 +305,7 @@ OUString makeURLAppendSysPathSegment( OUString const & baseURL, OUString const &
-//==============================================================================
+
OUString expandUnoRcTerm( OUString const & term_ )
{
OUString term(term_);
@@ -328,7 +328,7 @@ OUString makeRcTerm( OUString const & url )
return url;
}
-//==============================================================================
+
OUString expandUnoRcUrl( OUString const & url )
{
if (url.match( "vnd.sun.star.expand:" )) {
@@ -346,7 +346,7 @@ OUString expandUnoRcUrl( OUString const & url )
}
}
-//==============================================================================
+
bool office_is_running()
{
//We need to check if we run within the office process. Then we must not use the pipe, because
@@ -384,7 +384,7 @@ bool office_is_running()
return ret;
}
-//==============================================================================
+
oslProcess raiseProcess(
OUString const & appURL, Sequence<OUString> const & args )
{
@@ -420,7 +420,7 @@ oslProcess raiseProcess(
return hProcess;
}
-//==============================================================================
+
OUString generateRandomPipeId()
{
// compute some good pipe id:
@@ -439,7 +439,7 @@ OUString generateRandomPipeId()
return buf.makeStringAndClear();
}
-//==============================================================================
+
Reference<XInterface> resolveUnoURL(
OUString const & connectString,
Reference<XComponentContext> const & xLocalContext,
diff --git a/desktop/source/deployment/misc/dp_platform.cxx b/desktop/source/deployment/misc/dp_platform.cxx
index 95ff81a..09b3fcd 100644
--- a/desktop/source/deployment/misc/dp_platform.cxx
+++ b/desktop/source/deployment/misc/dp_platform.cxx
@@ -187,7 +187,7 @@ namespace
}
} // anon namespace
-//=============================================================================
+
OUString const & getPlatformString()
{
diff --git a/desktop/source/deployment/misc/dp_resource.cxx b/desktop/source/deployment/misc/dp_resource.cxx
index f8c43d7..f88743a 100644
--- a/desktop/source/deployment/misc/dp_resource.cxx
+++ b/desktop/source/deployment/misc/dp_resource.cxx
@@ -58,14 +58,14 @@ class theResourceMutex : public rtl::Static<osl::Mutex, theResourceMutex> {};
} // anon namespace
-//==============================================================================
+
ResId getResId( sal_uInt16 id )
{
const osl::MutexGuard guard( theResourceMutex::get() );
return ResId( id, *DeploymentResMgr::get() );
}
-//==============================================================================
+
OUString getResourceString( sal_uInt16 id )
{
const osl::MutexGuard guard(theResourceMutex::get());
@@ -73,7 +73,7 @@ OUString getResourceString( sal_uInt16 id )
return ret.replaceAll("%PRODUCTNAME", utl::ConfigManager::getProductName());
}
-//==============================================================================
+
const LanguageTag & getOfficeLanguageTag()
{
return OfficeLocale::get();
diff --git a/desktop/source/deployment/misc/dp_ucb.cxx b/desktop/source/deployment/misc/dp_ucb.cxx
index 82ca143..f53cba2 100644
--- a/desktop/source/deployment/misc/dp_ucb.cxx
+++ b/desktop/source/deployment/misc/dp_ucb.cxx
@@ -38,7 +38,7 @@ using namespace ::com::sun::star::ucb;
namespace dp_misc
{
-//==============================================================================
+
bool create_ucb_content(
::ucbhelper::Content * ret_ucbContent, OUString const & url,
Reference<XCommandEnvironment> const & xCmdEnv,
@@ -75,7 +75,7 @@ bool create_ucb_content(
return false;
}
-//==============================================================================
+
bool create_folder(
::ucbhelper::Content * ret_ucb_content, OUString const & url_,
Reference<XCommandEnvironment> const & xCmdEnv, bool throw_exc )
@@ -159,7 +159,7 @@ bool create_folder(
return false;
}
-//==============================================================================
+
bool erase_path( OUString const & url,
Reference<XCommandEnvironment> const & xCmdEnv,
bool throw_exc )
@@ -183,7 +183,7 @@ bool erase_path( OUString const & url,
return true;
}
-//==============================================================================
+
::rtl::ByteSequence readFile( ::ucbhelper::Content & ucb_content )
{
::rtl::ByteSequence bytes;
@@ -196,7 +196,7 @@ bool erase_path( OUString const & url,
return bytes;
}
-//==============================================================================
+
bool readLine( OUString * res, OUString const & startingWith,
::ucbhelper::Content & ucb_content, rtl_TextEncoding textenc )
{
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx
index 4b1d20f..b158a65 100644
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/desktop/source/deployment/registry/component/dp_component.cxx
@@ -101,7 +101,7 @@ bool jarManifestHeaderPresent(
&& readLine( &line, name, manifestContent, RTL_TEXTENCODING_ASCII_US );
}
-//==============================================================================
+
class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
{
class ComponentPackageImpl : public ::dp_registry::backend::Package
diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
index 275e857..7876ff2 100644
--- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx
+++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
@@ -61,7 +61,7 @@ namespace {
typedef ::std::list<OUString> t_stringlist;
-//==============================================================================
+
class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
{
class PackageImpl : public ::dp_registry::backend::Package
diff --git a/desktop/source/deployment/registry/dp_registry.cxx b/desktop/source/deployment/registry/dp_registry.cxx
index 0783685..7dbfb30 100644
--- a/desktop/source/deployment/registry/dp_registry.cxx
+++ b/desktop/source/deployment/registry/dp_registry.cxx
@@ -65,7 +65,7 @@ namespace {
typedef ::cppu::WeakComponentImplHelper2<
deployment::XPackageRegistry, util::XUpdatable > t_helper;
-//==============================================================================
+
class PackageRegistryImpl : private MutexHolder, public t_helper
{
struct ci_string_hash {
@@ -541,7 +541,7 @@ PackageRegistryImpl::getSupportedPackageTypes() throw (RuntimeException, std::ex
}
} // anon namespace
-//==============================================================================
+
Reference<deployment::XPackageRegistry> SAL_CALL create(
OUString const & context,
OUString const & cachePath, bool readOnly,
diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx
index a9d8f57..f784019 100644
--- a/desktop/source/deployment/registry/help/dp_help.cxx
+++ b/desktop/source/deployment/registry/help/dp_help.cxx
@@ -53,7 +53,7 @@ namespace backend {
namespace help {
namespace {
-//==============================================================================
+
class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
{
class PackageImpl : public ::dp_registry::backend::Package
diff --git a/desktop/source/deployment/registry/inc/dp_backend.h b/desktop/source/deployment/registry/inc/dp_backend.h
index b2dd744..7bcabb27 100644
--- a/desktop/source/deployment/registry/inc/dp_backend.h
+++ b/desktop/source/deployment/registry/inc/dp_backend.h
@@ -49,7 +49,7 @@ class PackageRegistryBackend;
typedef ::cppu::WeakComponentImplHelper1<
css::deployment::XPackage > t_PackageBase;
-//==============================================================================
+
class Package : protected ::dp_misc::MutexHolder, public t_PackageBase
{
PackageRegistryBackend * getMyBackend() const;
@@ -264,7 +264,7 @@ typedef ::cppu::WeakComponentImplHelper2<
css::lang::XEventListener,
css::deployment::XPackageRegistry > t_BackendBase;
-//==============================================================================
+
class PackageRegistryBackend
: protected ::dp_misc::MutexHolder, public t_BackendBase
{
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx
index e15939b..2824f49 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -80,7 +80,7 @@ namespace {
typedef cppu::ImplInheritanceHelper1<PackageRegistryBackend,
lang::XServiceInfo> ImplBaseT;
-//==============================================================================
+
class BackendImpl : public ImplBaseT
{
class PackageImpl : public ::dp_registry::backend::Package
@@ -1646,7 +1646,7 @@ BackendImpl::PackageImpl::getPackagesFromDb(
} // anon namespace
-//==============================================================================
+
Reference<deployment::XPackageRegistry> create(
Reference<deployment::XPackageRegistry> const & xRootRegistry,
OUString const & context, OUString const & cachePath, bool readOnly,
diff --git a/desktop/source/deployment/registry/script/dp_lib_container.h b/desktop/source/deployment/registry/script/dp_lib_container.h
index 26b2ccd..adccfa4 100644
--- a/desktop/source/deployment/registry/script/dp_lib_container.h
+++ b/desktop/source/deployment/registry/script/dp_lib_container.h
@@ -36,7 +36,7 @@ namespace dp_registry {
namespace backend {
namespace script {
-//==============================================================================
+
class LibraryContainer
{
public:
diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
index c7a0fe7..ff89bf1 100644
--- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
+++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
@@ -45,7 +45,7 @@ namespace backend
namespace sfwk
{
-//==============================================================================
+
class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
{
class PackageImpl : public ::dp_registry::backend::Package
diff --git a/desktop/source/migration/migration_impl.hxx b/desktop/source/migration/migration_impl.hxx
index 2f74d04..576e7d7 100644
--- a/desktop/source/migration/migration_impl.hxx
+++ b/desktop/source/migration/migration_impl.hxx
@@ -76,7 +76,7 @@ typedef std::vector< migration_step > migrations_v;
typedef std::auto_ptr< migrations_v > migrations_vr;
typedef std::vector< supported_migration > migrations_available;
-//__________________________________________
+
/**
define the item, e.g.:menuitem, toolbaritem, to be migrated. we keep the information
of the command URL, the previous sibling node and the parent node of a item
@@ -143,7 +143,7 @@ struct MigrationItemInfo
}
};
-//__________________________________________
+
/**
information for the UI elements to be migrated for one module
*/
@@ -156,7 +156,7 @@ struct MigrationModuleInfo
MigrationModuleInfo():bHasMenubar(sal_False){};
};
-//__________________________________________
+
/**
get the information before copying the ui configuration files of old version to new version
*/
diff --git a/desktop/source/migration/services/basicmigration.cxx b/desktop/source/migration/services/basicmigration.cxx
index 45d03f7..5d7c63f 100644
--- a/desktop/source/migration/services/basicmigration.cxx
+++ b/desktop/source/migration/services/basicmigration.cxx
@@ -27,18 +27,18 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-//.........................................................................
+
namespace migration
{
-//.........................................................................
+
#define sSourceUserBasic OUString( "/user/basic" )
#define sTargetUserBasic OUString( "/user/__basic_80" )
- // =============================================================================
+
// component operations
- // =============================================================================
+
OUString BasicMigration_getImplementationName()
{
@@ -54,9 +54,9 @@ namespace migration
return aNames;
}
- // =============================================================================
+
// BasicMigration
- // =============================================================================
+
BasicMigration::BasicMigration()
{
@@ -222,9 +222,9 @@ namespace migration
return Any();
}
- // =============================================================================
+
// component operations
- // =============================================================================
+
Reference< XInterface > SAL_CALL BasicMigration_create(
Reference< XComponentContext > const & )
@@ -235,8 +235,8 @@ namespace migration
-//.........................................................................
+
} // namespace migration
-//.........................................................................
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/migration/services/basicmigration.hxx b/desktop/source/migration/services/basicmigration.hxx
index c20d067..59acfc2 100644
--- a/desktop/source/migration/services/basicmigration.hxx
+++ b/desktop/source/migration/services/basicmigration.hxx
@@ -33,10 +33,10 @@
class INetURLObject;
-//.........................................................................
+
namespace migration
{
-//.........................................................................
+
OUString SAL_CALL BasicMigration_getImplementationName();
::com::sun::star::uno::Sequence< OUString > SAL_CALL BasicMigration_getSupportedServiceNames();
@@ -45,9 +45,9 @@ namespace migration
SAL_THROW( (::com::sun::star::uno::Exception) );
- // =============================================================================
+
// class BasicMigration
- // =============================================================================
+
typedef ::cppu::WeakImplHelper3<
::com::sun::star::lang::XServiceInfo,
@@ -87,9 +87,9 @@ namespace migration
::com::sun::star::uno::RuntimeException, std::exception);
};
-//.........................................................................
+
} // namespace migration
-//.........................................................................
+
#endif // INCLUDED_DESKTOP_SOURCE_MIGRATION_SERVICES_BASICMIGRATION_HXX
diff --git a/desktop/source/migration/services/misc.hxx b/desktop/source/migration/services/misc.hxx
index 46ad30b..13013bb 100644
--- a/desktop/source/migration/services/misc.hxx
+++ b/desktop/source/migration/services/misc.hxx
@@ -25,17 +25,17 @@
#include <vector>
#include <memory>
-//.........................................................................
+
namespace migration
{
-//.........................................................................
+
typedef ::std::vector< OUString > TStringVector;
typedef ::std::auto_ptr< TStringVector > TStringVectorPtr;
-//.........................................................................
+
} // namespace migration
-//.........................................................................
+
#endif // INCLUDED_DESKTOP_SOURCE_MIGRATION_SERVICES_MISC_HXX
diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx b/desktop/source/migration/services/oo3extensionmigration.cxx
index 993153c..852ef16 100644
--- a/desktop/source/migration/services/oo3extensionmigration.cxx
+++ b/desktop/source/migration/services/oo3extensionmigration.cxx
@@ -54,9 +54,9 @@ static OUString sSubDirName( "cache" );
static OUString sDescriptionXmlFile( "/description.xml" );
static OUString sExtensionRootSubDirName( "/uno_packages" );
-// =============================================================================
+
// component operations
-// =============================================================================
+
OUString OO3ExtensionMigration_getImplementationName()
{
@@ -91,9 +91,9 @@ Sequence< OUString > OO3ExtensionMigration_getSupportedServiceNames()
return *pNames;
}
-// =============================================================================
+
// ExtensionMigration
-// =============================================================================
+
OO3ExtensionMigration::OO3ExtensionMigration(Reference< XComponentContext > const & ctx) :
m_ctx(ctx)
@@ -479,9 +479,9 @@ void TmpRepositoryCommandEnv::pop() throw (uno::RuntimeException, std::exception
{
}
-// =============================================================================
+
// component operations
-// =============================================================================
+
Reference< XInterface > SAL_CALL OO3ExtensionMigration_create(
Reference< XComponentContext > const & ctx )
diff --git a/desktop/source/migration/services/oo3extensionmigration.hxx b/desktop/source/migration/services/oo3extensionmigration.hxx
index 4a03a2c..2ba4269 100644
--- a/desktop/source/migration/services/oo3extensionmigration.hxx
+++ b/desktop/source/migration/services/oo3extensionmigration.hxx
@@ -54,9 +54,9 @@ namespace migration
SAL_THROW( (::com::sun::star::uno::Exception) );
- // =============================================================================
+
// class ExtensionMigration
- // =============================================================================
+
typedef ::cppu::WeakImplHelper3<
::com::sun::star::lang::XServiceInfo,
@@ -141,9 +141,9 @@ namespace migration
virtual void SAL_CALL pop() throw (::com::sun::star::uno::RuntimeException, std::exception);
};
-//.........................................................................
+
} // namespace migration
-//.........................................................................
+
#endif // INCLUDED_DESKTOP_SOURCE_MIGRATION_SERVICES_OO3EXTENSIONMIGRATION_HXX
diff --git a/desktop/source/migration/services/wordbookmigration.cxx b/desktop/source/migration/services/wordbookmigration.cxx
index 842611e..0ce3e18 100644
--- a/desktop/source/migration/services/wordbookmigration.cxx
+++ b/desktop/source/migration/services/wordbookmigration.cxx
@@ -27,19 +27,19 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-//.........................................................................
+
namespace migration
{
-//.........................................................................
+
static OUString sSourceSubDir( "/user/wordbook" );
static OUString sTargetSubDir( "/user/wordbook" );
- // =============================================================================
+
// component operations
- // =============================================================================
+
OUString WordbookMigration_getImplementationName()
{
@@ -74,9 +74,9 @@ namespace migration
return *pNames;
}
- // =============================================================================
+
// WordbookMigration
- // =============================================================================
+
WordbookMigration::WordbookMigration()
{
@@ -288,9 +288,9 @@ bool IsUserWordbook( const OUString& rFile )
return Any();
}
- // =============================================================================
+
// component operations
- // =============================================================================
+
Reference< XInterface > SAL_CALL WordbookMigration_create(
Reference< XComponentContext > const & )
@@ -301,8 +301,8 @@ bool IsUserWordbook( const OUString& rFile )
-//.........................................................................
+
} // namespace migration
-//.........................................................................
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/migration/services/wordbookmigration.hxx b/desktop/source/migration/services/wordbookmigration.hxx
index bbe181b..a25e245 100644
--- a/desktop/source/migration/services/wordbookmigration.hxx
+++ b/desktop/source/migration/services/wordbookmigration.hxx
@@ -33,10 +33,10 @@
class INetURLObject;
-//.........................................................................
+
namespace migration
{
-//.........................................................................
+
OUString SAL_CALL WordbookMigration_getImplementationName();
::com::sun::star::uno::Sequence< OUString > SAL_CALL WordbookMigration_getSupportedServiceNames();
@@ -45,9 +45,9 @@ namespace migration
SAL_THROW( (::com::sun::star::uno::Exception) );
- // =============================================================================
+
// class WordbookMigration
- // =============================================================================
+
typedef ::cppu::WeakImplHelper3<
::com::sun::star::lang::XServiceInfo,
@@ -87,9 +87,9 @@ namespace migration
::com::sun::star::uno::RuntimeException, std::exception);
};
-//.........................................................................
+
} // namespace migration
-//.........................................................................
+
#endif // _DESKTOP_AUTOCORRMIGRATION_HXX_
diff --git a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
index e7b0373..7927481 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
@@ -50,7 +50,7 @@ using namespace ::unopkg;
namespace {
-//==============================================================================
+
class CommandEnvironmentImpl
: public ::cppu::WeakImplHelper3< XCommandEnvironment,
task::XInteractionHandler,
@@ -397,7 +397,7 @@ void CommandEnvironmentImpl::pop() throw (RuntimeException, std::exception)
namespace unopkg {
-//==============================================================================
+
Reference< XCommandEnvironment > createCmdEnv(
Reference< XComponentContext > const & xContext,
OUString const & logFile,
diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
index 97b32ad..c422e4a 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
@@ -66,7 +66,7 @@ OUString toString( OptionInfo const * info )
return buf.makeStringAndClear();
}
-//==============================================================================
+
OptionInfo const * getOptionInfo(
OptionInfo const * list,
OUString const & opt, sal_Unicode copt )
@@ -97,7 +97,7 @@ OptionInfo const * getOptionInfo(
return 0;
}
-//==============================================================================
+
bool isOption( OptionInfo const * option_info, sal_uInt32 * pIndex )
{
OSL_ASSERT( option_info != 0 );
@@ -128,7 +128,7 @@ bool isOption( OptionInfo const * option_info, sal_uInt32 * pIndex )
}
return false;
}
-//==============================================================================
+
bool isBootstrapVariable(sal_uInt32 * pIndex)
{
@@ -144,7 +144,7 @@ bool isBootstrapVariable(sal_uInt32 * pIndex)
return false;
}
-//==============================================================================
+
bool readArgument(
OUString * pValue, OptionInfo const * option_info, sal_uInt32 * pIndex )
{
@@ -186,19 +186,19 @@ struct ProcessWorkingDir : public rtl::StaticWithInit<
};
} // anon namespace
-//==============================================================================
+
OUString const & getExecutableDir()
{
return ExecutableDir::get();
}
-//==============================================================================
+
OUString const & getProcessWorkingDir()
{
return ProcessWorkingDir::get();
}
-//==============================================================================
+
OUString makeAbsoluteFileUrl(
OUString const & sys_path, OUString const & base_url, bool throw_exc )
{
@@ -320,7 +320,7 @@ void printf_unaccepted_licenses(
dp_misc::writeConsole("License not accepted\n\n");
}
-//==============================================================================
+
void printf_packages(
::std::vector< Reference<deployment::XPackage> > const & allExtensions,
::std::vector<bool> const & vecUnaccepted,
@@ -437,7 +437,7 @@ OUString getLockFilePath()
return ret;
}
-//==============================================================================
+
Reference<XComponentContext> getUNO(
bool verbose, bool shared, bool bGui,
Reference<XComponentContext> & out_localContext)
diff --git a/desktop/source/pkgchk/unopkg/unopkg_shared.h b/desktop/source/pkgchk/unopkg/unopkg_shared.h
index e12a965..24e0b6b 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_shared.h
+++ b/desktop/source/pkgchk/unopkg/unopkg_shared.h
@@ -53,23 +53,23 @@ struct LockFileException : public css::uno::Exception
css::uno::Exception(sMessage, css::uno::Reference< css::uno::XInterface > ()) {}
};
-//==============================================================================
+
OUString toString( OptionInfo const * info );
-//==============================================================================
+
OptionInfo const * getOptionInfo(
OptionInfo const * list,
OUString const & opt, sal_Unicode copt = '\0' );
-//==============================================================================
+
bool isOption( OptionInfo const * option_info, sal_uInt32 * pIndex );
-//==============================================================================
+
bool readArgument(
OUString * pValue, OptionInfo const * option_info,
sal_uInt32 * pIndex );
-//==============================================================================
+
inline bool readOption(
bool * flag, OptionInfo const * option_info, sal_uInt32 * pIndex )
{
@@ -80,33 +80,33 @@ inline bool readOption(
}
return false;
}
-//==============================================================================
+
/** checks if an argument is a bootstrap variable. These start with -env:. For example
-env:UNO_JAVA_JFW_USER_DATA=file:///d:/user
*/
bool isBootstrapVariable(sal_uInt32 * pIndex);
-//==============================================================================
+
OUString const & getExecutableDir();
-//==============================================================================
+
OUString const & getProcessWorkingDir();
-//==============================================================================
+
OUString makeAbsoluteFileUrl(
OUString const & sys_path, OUString const & base_url,
bool throw_exc = true );
-//##############################################################################
-//==============================================================================
+
+
css::uno::Reference<css::ucb::XCommandEnvironment> createCmdEnv(
css::uno::Reference<css::uno::XComponentContext> const & xContext,
OUString const & logFile,
bool option_force_overwrite,
bool option_verbose,
bool option_suppressLicense);
-//==============================================================================
+
void printf_packages(
::std::vector<
css::uno::Reference<css::deployment::XPackage> > const & allExtensions,
@@ -114,9 +114,9 @@ void printf_packages(
css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv,
sal_Int32 level = 0 );
-//##############################################################################
-//==============================================================================
+
+
css::uno::Reference<css::uno::XComponentContext> getUNO(
bool verbose, bool shared, bool bGui,
css::uno::Reference<css::uno::XComponentContext> & out_LocalComponentContext);
diff --git a/desktop/util/officeloader.rc b/desktop/util/officeloader.rc
index aee686d..a7d65d2 100644
--- a/desktop/util/officeloader.rc
+++ b/desktop/util/officeloader.rc
@@ -19,9 +19,9 @@
#include <windows.h>
#include "version.hrc"
-// -----------------------------------------------------------------------
+
// version information
-// -----------------------------------------------------------------------
+
VS_VERSION_INFO VERSIONINFO
FILEVERSION VERSION, SUBVERSION, MICROVERSION, VERVARIANT
diff --git a/desktop/win32/source/QuickStart/QuickStart.cxx b/desktop/win32/source/QuickStart/QuickStart.cxx
index 4998b4e..77ba5cf 100644
--- a/desktop/win32/source/QuickStart/QuickStart.cxx
+++ b/desktop/win32/source/QuickStart/QuickStart.cxx
@@ -18,7 +18,7 @@
*/
// QuickStart.cpp : Defines the entry point for the application.
-//
+
#include "StdAfx.h"
#include "resource.h"
diff --git a/desktop/win32/source/QuickStart/StdAfx.h b/desktop/win32/source/QuickStart/StdAfx.h
index ce29121..74dcd67 100644
--- a/desktop/win32/source/QuickStart/StdAfx.h
+++ b/desktop/win32/source/QuickStart/StdAfx.h
@@ -19,7 +19,7 @@
// stdafx.h : include file for standard system include files,
// or project specific include files that are used frequently, but
// are changed infrequently
-//
+
#if !defined(AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_)
#define AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_
diff --git a/desktop/win32/source/applauncher/launcher.rc b/desktop/win32/source/applauncher/launcher.rc
index 0f8ffeb..f717bcb 100644
--- a/desktop/win32/source/applauncher/launcher.rc
+++ b/desktop/win32/source/applauncher/launcher.rc
@@ -19,9 +19,9 @@
#include <windows.h>
#include "version.hrc"
-// -----------------------------------------------------------------------
+
// version information
-// -----------------------------------------------------------------------
+
VS_VERSION_INFO VERSIONINFO
FILEVERSION VERSION, SUBVERSION, MICROVERSION, VERVARIANT
diff --git a/desktop/win32/source/guistdio/guistdio.inc b/desktop/win32/source/guistdio/guistdio.inc
index 5918ccc..47cf9b0 100644
--- a/desktop/win32/source/guistdio/guistdio.inc
+++ b/desktop/win32/source/guistdio/guistdio.inc
@@ -121,9 +121,9 @@ DWORD WINAPI OutputThread( LPVOID pParam )
return 0;
}
#endif
-//---------------------------------------------------------------------------
+
// Thread that reads from child process standard error pipe
-//---------------------------------------------------------------------------
+
#ifdef UNOPKG
DWORD WINAPI ErrorThread( LPVOID pParam )
@@ -148,9 +148,9 @@ DWORD WINAPI ErrorThread( LPVOID pParam )
return 0;
}
#endif
-//---------------------------------------------------------------------------
+
// Thread that writes to child process standard input pipe
-//---------------------------------------------------------------------------
+
#ifdef UNOPKG
DWORD WINAPI InputThread( LPVOID pParam )
@@ -241,9 +241,9 @@ DWORD WINAPI InputThread( LPVOID pParam )
}
#endif
-//---------------------------------------------------------------------------
+
// Thread that waits until child process reached input idle
-//---------------------------------------------------------------------------
+
DWORD WINAPI WaitForUIThread( LPVOID pParam )
{
@@ -260,9 +260,9 @@ DWORD WINAPI WaitForUIThread( LPVOID pParam )
}
-//---------------------------------------------------------------------------
+
// Ctrl-Break handler that terminates the child process if Ctrl-C was pressed
-//---------------------------------------------------------------------------
+
HANDLE hTargetProcess = INVALID_HANDLE_VALUE;
@@ -275,9 +275,9 @@ BOOL WINAPI CtrlBreakHandler(
}
-//---------------------------------------------------------------------------
-//---------------------------------------------------------------------------
+
+
#ifdef __MINGW32__
int main( int, char ** )
More information about the Libreoffice-commits
mailing list