summaryrefslogtreecommitdiff
path: root/desktop/source/deployment/inc
diff options
context:
space:
mode:
authorAlexander Wilms <f.alexander.wilms@gmail.com>2014-02-25 18:19:04 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-02-27 05:59:38 -0600
commit2991d2d65bf8b99d82d1f7d209332d0c303dff21 (patch)
tree3c2fd5215307bb1547e594f423636ad882594523 /desktop/source/deployment/inc
parente74a09929d4771972913a3ebcdd6df042f871fca (diff)
Remove visual noise from desktop
Change-Id: Ib8ca7794ce6f3e96ee3a9b2896b141635665552c Reviewed-on: https://gerrit.libreoffice.org/8252 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'desktop/source/deployment/inc')
-rw-r--r--desktop/source/deployment/inc/dp_interact.h16
-rw-r--r--desktop/source/deployment/inc/dp_misc.h22
-rw-r--r--desktop/source/deployment/inc/dp_resource.h6
-rw-r--r--desktop/source/deployment/inc/dp_ucb.h10
-rw-r--r--desktop/source/deployment/inc/dp_xml.h2
5 files changed, 28 insertions, 28 deletions
diff --git a/desktop/source/deployment/inc/dp_interact.h b/desktop/source/deployment/inc/dp_interact.h
index 1d65128eb559..12a98495ce2a 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 9c0921971712..fc7aa8b837a4 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 f1390ad52825..622ba17db9e8 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 32f8cd4d008b..3ef3eb6ee705 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 d32b8a152c43..a5c96ec9cc5e 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,