[Libreoffice-commits] .: 12 commits - svl/inc svl/source svtools/source tools/source vcl/inc vcl/source vcl/unx
Caolán McNamara
caolan at kemper.freedesktop.org
Thu Jun 23 01:09:35 PDT 2011
svl/inc/svl/inettype.hxx | 31 -------------------
svl/inc/svl/ownlist.hxx | 16 ---------
svl/inc/svl/urihelper.hxx | 28 -----------------
svl/source/misc/inettype.cxx | 45 ---------------------------
svl/source/misc/ownlist.cxx | 58 ------------------------------------
svl/source/misc/urihelper.cxx | 26 +---------------
svtools/source/svhtml/parhtml.cxx | 7 +---
tools/source/rc/isofallback.cxx | 2 -
vcl/inc/unx/saldisp.hxx | 5 +--
vcl/inc/vcl/svapp.hxx | 40 +++---------------------
vcl/source/window/floatwin.cxx | 17 ++++++++--
vcl/unx/generic/app/saldisp.cxx | 12 +++----
vcl/unx/generic/window/salframe.cxx | 2 -
13 files changed, 34 insertions(+), 255 deletions(-)
New commits:
commit 485b6dc95fe783ef3bb9bbe1ae2f65fe04edc926
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jun 23 09:02:47 2011 +0100
Resolves: fdo#33509 Context menu in spellcheck in RTL UI closes too early
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index b76b9a4..5508620 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -697,13 +697,22 @@ void FloatingWindow::StartPopupMode( const Rectangle& rRect, sal_uLong nFlags )
// so they can be compared across different frames
// !!! rRect is expected to be in screen coordinates of the parent frame window !!!
maFloatRect = rRect;
- if( GetParent()->ImplHasMirroredGraphics() )
+
+ Window *pReference = GetParent();
+
+ // compare coordinates in absolute screen coordinates
+ // Keep in sync with FloatingWindow::ImplFloatHitTest, e.g. fdo#33509
+ if( pReference->ImplHasMirroredGraphics() )
{
- maFloatRect.SetPos( GetParent()->ScreenToOutputPixel( rRect.TopLeft() ) );
- maFloatRect = GetParent()->ImplOutputToUnmirroredAbsoluteScreenPixel( maFloatRect );
+ if(!pReference->IsRTLEnabled() )
+ // --- RTL --- re-mirror back to get device coordiantes
+ pReference->ImplReMirror(maFloatRect);
+
+ maFloatRect.SetPos(pReference->ScreenToOutputPixel(maFloatRect.TopLeft()));
+ maFloatRect = pReference->ImplOutputToUnmirroredAbsoluteScreenPixel(maFloatRect);
}
else
- maFloatRect.SetPos( GetParent()->OutputToAbsoluteScreenPixel( GetParent()->ScreenToOutputPixel( rRect.TopLeft() ) ) );
+ maFloatRect.SetPos(pReference->OutputToAbsoluteScreenPixel(pReference->ScreenToOutputPixel(rRect.TopLeft())));
maFloatRect.Left() -= 2;
maFloatRect.Top() -= 2;
commit 7ca2981536c08b51dd6d6f5e94c0dfaec9982af2
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jun 23 00:49:47 2011 +0100
remove unused forward declaration
diff --git a/svl/inc/svl/urihelper.hxx b/svl/inc/svl/urihelper.hxx
index 5fee5b2..f89dc40 100644
--- a/svl/inc/svl/urihelper.hxx
+++ b/svl/inc/svl/urihelper.hxx
@@ -42,7 +42,6 @@ namespace com { namespace sun { namespace star {
namespace uri { class XUriReference; }
} } }
namespace rtl { class OUString; }
-class ByteString;
class CharClass;
class UniString;
commit a8378edd77739784f4b101ac8090b8ae157ed769
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jun 23 00:49:14 2011 +0100
Remove unused SmartRel2Abs variant
diff --git a/svl/inc/svl/urihelper.hxx b/svl/inc/svl/urihelper.hxx
index 36c5022..5fee5b2 100644
--- a/svl/inc/svl/urihelper.hxx
+++ b/svl/inc/svl/urihelper.hxx
@@ -64,33 +64,6 @@ namespace URIHelper {
*/
SVL_DLLPUBLIC UniString
SmartRel2Abs(INetURLObject const & rTheBaseURIRef,
- ByteString const & rTheRelURIRef,
- Link const & rMaybeFileHdl = Link(),
- bool bCheckFileExists = true,
- bool bIgnoreFragment = false,
- INetURLObject::EncodeMechanism eEncodeMechanism
- = INetURLObject::WAS_ENCODED,
- INetURLObject::DecodeMechanism eDecodeMechanism
- = INetURLObject::DECODE_TO_IURI,
- rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8,
- bool bRelativeNonURIs = false,
- INetURLObject::FSysStyle eStyle = INetURLObject::FSYS_DETECT);
-
-/**
- @ATT
- Calling this function with defaulted arguments rMaybeFileHdl = Link() and
- bCheckFileExists = true often leads to results that are not intended:
- Whenever the given rTheBaseURIRef is a file URL, the given rTheRelURIRef is
- relative, and rTheRelURIRef could also be smart-parsed as a non-file URL
- (e.g., the relative URL "foo/bar" can be smart-parsed as "http://foo/bar"),
- then SmartRel2Abs called with rMaybeFileHdl = Link() and bCheckFileExists =
- true returns the non-file URL interpretation. To avoid this, either pass
- some non-null rMaybeFileHdl if you want to check generated file URLs for
- existence (see URIHelper::GetMaybeFileHdl), or use bCheckFileExists = false
- if you want to generate file URLs without checking for their existence.
-*/
-SVL_DLLPUBLIC UniString
-SmartRel2Abs(INetURLObject const & rTheBaseURIRef,
UniString const & rTheRelURIRef,
Link const & rMaybeFileHdl = Link(),
bool bCheckFileExists = true,
diff --git a/svl/source/misc/urihelper.cxx b/svl/source/misc/urihelper.cxx
index dec3038..a30439d 100644
--- a/svl/source/misc/urihelper.cxx
+++ b/svl/source/misc/urihelper.cxx
@@ -148,24 +148,6 @@ inline UniString SmartRel2Abs_Impl(INetURLObject const & rTheBaseURIRef,
UniString
URIHelper::SmartRel2Abs(INetURLObject const & rTheBaseURIRef,
- ByteString const & rTheRelURIRef,
- Link const & rMaybeFileHdl,
- bool bCheckFileExists,
- bool bIgnoreFragment,
- INetURLObject::EncodeMechanism eEncodeMechanism,
- INetURLObject::DecodeMechanism eDecodeMechanism,
- rtl_TextEncoding eCharset,
- bool bRelativeNonURIs,
- INetURLObject::FSysStyle eStyle)
-{
- return SmartRel2Abs_Impl(rTheBaseURIRef, rTheRelURIRef, rMaybeFileHdl,
- bCheckFileExists, bIgnoreFragment,
- eEncodeMechanism, eDecodeMechanism, eCharset,
- bRelativeNonURIs, eStyle);
-}
-
-UniString
-URIHelper::SmartRel2Abs(INetURLObject const & rTheBaseURIRef,
UniString const & rTheRelURIRef,
Link const & rMaybeFileHdl,
bool bCheckFileExists,
commit d204cdb1a455d58fb387c4dc5ebe4513b5f100bb
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jun 23 00:40:27 2011 +0100
use OString::equalsL
diff --git a/tools/source/rc/isofallback.cxx b/tools/source/rc/isofallback.cxx
index 173f1b4..8ddb1f2 100644
--- a/tools/source/rc/isofallback.cxx
+++ b/tools/source/rc/isofallback.cxx
@@ -42,7 +42,7 @@ bool GetIsoFallback(rtl::OString& rLanguage)
sal_Int32 nSepPos = rLanguage.indexOf('-');
if (nSepPos == -1)
{
- if (rLanguage == rtl::OString(RTL_CONSTASCII_STRINGPARAM("en")))
+ if (rLanguage.equalsL(RTL_CONSTASCII_STRINGPARAM("en")))
{
// en -> ""
rLanguage = rtl::OString();
commit 51d7bedc5383109518673e3391a7a88bb8ea2b2b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jun 23 00:34:11 2011 +0100
anonymous namespaces work fine now
diff --git a/svl/source/misc/urihelper.cxx b/svl/source/misc/urihelper.cxx
index a837582..dec3038 100644
--- a/svl/source/misc/urihelper.cxx
+++ b/svl/source/misc/urihelper.cxx
@@ -65,10 +65,6 @@
#include <unotools/charclass.hxx>
#include "rtl/instance.hxx"
-namespace unnamed_svl_urihelper {}
-using namespace unnamed_svl_urihelper;
- // unnamed namespaces don't work well yet...
-
namespace css = com::sun::star;
using namespace com::sun::star;
@@ -78,7 +74,7 @@ using namespace com::sun::star;
//
//============================================================================
-namespace unnamed_svl_urihelper {
+namespace {
inline UniString toUniString(ByteString const & rString)
{
@@ -422,7 +418,7 @@ rtl::OUString URIHelper::simpleNormalizedMakeRelative(
//
//============================================================================
-namespace unnamed_svl_urihelper {
+namespace {
inline xub_StrLen nextChar(UniString const & rStr, xub_StrLen nPos)
{
commit 6a4793e7da345e22f4a29c46b08fd253e8903c29
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jun 23 00:30:40 2011 +0100
ditch other unused stream operators
diff --git a/svl/inc/svl/ownlist.hxx b/svl/inc/svl/ownlist.hxx
index 5645612..e24d311 100644
--- a/svl/inc/svl/ownlist.hxx
+++ b/svl/inc/svl/ownlist.hxx
@@ -61,19 +61,6 @@ public:
}
const String & GetCommand() const { return aCommand; }
const String & GetArgument() const { return aArgument; }
-
- friend SvStream& operator >> ( SvStream& rStm, SvCommand & rThis )
- {
- rStm.ReadByteString( rThis.aCommand, gsl_getSystemTextEncoding() );
- rStm.ReadByteString( rThis.aArgument, gsl_getSystemTextEncoding() );
- return rStm;
- }
- friend SvStream& operator << ( SvStream& rStm, const SvCommand & rThis )
- {
- rStm.WriteByteString( rThis.aCommand, gsl_getSystemTextEncoding() );
- rStm.WriteByteString( rThis.aArgument, gsl_getSystemTextEncoding() );
- return rStm;
- }
};
typedef ::std::vector< SvCommand > SvCommandList_impl;
commit 79f4a3a8f3fb42053af853a5d0c2f95cb3178dd2
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jun 23 00:16:22 2011 +0100
ditch unused stream operators
diff --git a/svl/inc/svl/ownlist.hxx b/svl/inc/svl/ownlist.hxx
index 0d228ce..5645612 100644
--- a/svl/inc/svl/ownlist.hxx
+++ b/svl/inc/svl/ownlist.hxx
@@ -98,9 +98,6 @@ public:
sal_Bool FillFromSequence( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& );
void FillSequence( com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& );
- SVL_DLLPUBLIC friend SvStream& operator >> ( SvStream& rStm, SvCommandList & );
- SVL_DLLPUBLIC friend SvStream& operator << ( SvStream&, const SvCommandList & );
-
size_t size() const { return aCommandList.size(); }
SvCommand operator[]( size_t i) {
diff --git a/svl/source/misc/ownlist.cxx b/svl/source/misc/ownlist.cxx
index 65f6e47..0c7acdf 100644
--- a/svl/source/misc/ownlist.cxx
+++ b/svl/source/misc/ownlist.cxx
@@ -166,64 +166,6 @@ SvCommand & SvCommandList::Append
return aCommandList.back();
}
-//=========================================================================
-SvStream & operator >>
-(
- SvStream & rStm, /* Stream aus dem gelesen wird */
- SvCommandList & rThis /* Die zu f"ullende Liste */
-)
-/* [Beschreibung]
-
- Die Liste mit ihren Elementen wird gelesen. Das Format ist:
- 1. Anzahl der Elemente
- 2. Alle Elemente
-
- [R"uckgabewert]
-
- SvStream & Der "ubergebene Stream.
-*/
-{
- sal_uInt32 nCount = 0;
- rStm >> nCount;
- if( !rStm.GetError() )
- {
- while( nCount-- )
- {
- SvCommand aCmd;
- rStm >> aCmd;
- rThis.aCommandList.push_back( aCmd );
- }
- }
- return rStm;
-}
-
-//=========================================================================
-SvStream & operator <<
-(
- SvStream & rStm, /* Stream in den geschrieben wird */
- const SvCommandList & rThis /* Die zu schreibende Liste */
-)
-/* [Beschreibung]
-
- Die Liste mit ihren Elementen wir geschrieben. Das Format ist:
- 1. Anzahl der Elemente
- 2. Alle Elemente
-
- [R"uckgabewert]
-
- SvStream & Der "ubergebene Stream.
-*/
-{
- sal_uInt32 nCount = rThis.aCommandList.size();
- rStm << nCount;
-
- for( sal_uInt32 i = 0; i < nCount; i++ )
- {
- rStm << rThis.aCommandList[ i ];
- }
- return rStm;
-}
-
sal_Bool SvCommandList::FillFromSequence( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& aCommandSequence )
{
const sal_Int32 nCount = aCommandSequence.getLength();
commit 831ac097b5f3c8ce9ecc32cb511917973a665417
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jun 23 00:03:52 2011 +0100
remove parse ByteString variant
diff --git a/svl/inc/svl/inettype.hxx b/svl/inc/svl/inettype.hxx
index 5a3f833..8fb25d4 100644
--- a/svl/inc/svl/inettype.hxx
+++ b/svl/inc/svl/inettype.hxx
@@ -391,37 +391,6 @@ public:
with intervening linear white space and comments (cf. RFCs 822, 2045).
The RFC 2231 extension are supported. The encoding of rMediaType
- should be US-ASCII, but any values in the range 0x80--0xFF are
- interpretet 'as appropriate.'
-
- @param rType Returns the type (the first of the above tokens), in US-
- ASCII encoding and converted to lower case.
-
- @param rSubType Returns the sub type (the second of the above
- tokens), in US-ASCII encoding and converted to lower case.
-
- @param rParameters If not null, returns the parameters as a list of
- INetContentTypeParameters (the attributes are in US-ASCII encoding and
- converted to lower case, the values are in Unicode encoding). If
- null, only the syntax of the parameters is checked, but they are not
- returned.
-
- @return True if the syntax of the field body is correct. If false is
- returned, none of the output parameters will be modified!
- */
- static bool parse(ByteString const & rMediaType, ByteString & rType,
- ByteString & rSubType,
- INetContentTypeParameterList * pParameters = 0);
-
- /** Parse the body of an RFC 2045 Content-Type header field.
-
- @param rMediaType The body of the Content-Type header field. It must
- be of the form
-
- token "/" token *(";" token "=" (token / quoted-string))
-
- with intervening linear white space and comments (cf. RFCs 822, 2045).
- The RFC 2231 extension are supported. The encoding of rMediaType
should be US-ASCII, but any Unicode values in the range U+0080..U+FFFF
are interpretet 'as appropriate.'
diff --git a/svl/source/misc/inettype.cxx b/svl/source/misc/inettype.cxx
index 32ff4f3..444a3a7 100644
--- a/svl/source/misc/inettype.cxx
+++ b/svl/source/misc/inettype.cxx
@@ -1149,51 +1149,6 @@ INetContentType INetContentTypes::MapStringToContentType(UniString const &
//============================================================================
// static
-bool INetContentTypes::parse(ByteString const & rMediaType,
- ByteString & rType, ByteString & rSubType,
- INetContentTypeParameterList * pParameters)
-{
- sal_Char const * p = rMediaType.GetBuffer();
- sal_Char const * pEnd = p + rMediaType.Len();
-
- p = INetMIME::skipLinearWhiteSpaceComment(p, pEnd);
- sal_Char const * pToken = p;
- bool bDowncase = false;
- while (p != pEnd && INetMIME::isTokenChar(*p))
- {
- bDowncase = bDowncase || INetMIME::isUpperCase(*p);
- ++p;
- }
- if (p == pToken)
- return false;
- rType = ByteString(pToken, sal::static_int_cast< xub_StrLen >(p - pToken));
- if (bDowncase)
- rType.ToLowerAscii();
-
- p = INetMIME::skipLinearWhiteSpaceComment(p, pEnd);
- if (p == pEnd || *p++ != '/')
- return false;
-
- p = INetMIME::skipLinearWhiteSpaceComment(p, pEnd);
- pToken = p;
- bDowncase = false;
- while (p != pEnd && INetMIME::isTokenChar(*p))
- {
- bDowncase = bDowncase || INetMIME::isUpperCase(*p);
- ++p;
- }
- if (p == pToken)
- return false;
- rSubType = ByteString(
- pToken, sal::static_int_cast< xub_StrLen >(p - pToken));
- if (bDowncase)
- rSubType.ToLowerAscii();
-
- return INetMIME::scanParameters(p, pEnd, pParameters) == pEnd;
-}
-
-//============================================================================
-// static
bool INetContentTypes::parse(UniString const & rMediaType,
UniString & rType, UniString & rSubType,
INetContentTypeParameterList * pParameters)
diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx
index d8a80c2..1de6b51 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -2266,11 +2266,10 @@ bool HTMLParser::ParseMetaOptions(
rtl_TextEncoding HTMLParser::GetEncodingByMIME( const String& rMime )
{
- ByteString sType;
- ByteString sSubType;
+ String sType;
+ String sSubType;
INetContentTypeParameterList aParameters;
- ByteString sMime( rMime, RTL_TEXTENCODING_ASCII_US );
- if (INetContentTypes::parse(sMime, sType, sSubType, &aParameters))
+ if (INetContentTypes::parse(rMime, sType, sSubType, &aParameters))
{
const INetContentTypeParameter * pCharset
= aParameters.find("charset");
commit 1904141c85b7a1e29541438c7ee872799a59860b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jun 22 23:35:43 2011 +0100
this method is debugging only
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index d6b64d2..214666d 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -420,8 +420,9 @@ public:
bool DispatchInternalEvent();
void PrintInfo() const;
- void PrintEvent( const ByteString &rComment,
- XEvent *pEvent ) const;
+#ifdef DBG_UTIL
+ void DbgPrintDisplayEvent(const char *pComment, XEvent *pEvent) const;
+#endif
void Beep() const;
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 309c71b..36cd1c7 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -2358,7 +2358,7 @@ void SalX11Display::Yield()
if( pXLib_->HasXErrorOccurred() )
{
XFlush( pDisp_ );
- PrintEvent( "SalDisplay::Yield (WasXError)", &aEvent );
+ DbgPrintDisplayEvent("SalDisplay::Yield (WasXError)", &aEvent);
}
#endif
pXLib_->ResetXErrorOccurred();
@@ -2475,14 +2475,13 @@ long SalX11Display::Dispatch( XEvent *pEvent )
return 0;
}
-// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-void SalDisplay::PrintEvent( const ByteString &rComment,
- XEvent *pEvent ) const
+#ifdef DBG_UTIL
+void SalDisplay::DbgPrintDisplayEvent(const char *pComment, XEvent *pEvent) const
{
if( pEvent->type <= MappingNotify )
{
fprintf( stderr, "[%s] %s s=%d w=%ld\n",
- rComment.GetBuffer(),
+ pComment,
EventNames[pEvent->type],
pEvent->xany.send_event,
pEvent->xany.window );
@@ -2609,11 +2608,12 @@ void SalDisplay::PrintEvent( const ByteString &rComment,
}
else
fprintf( stderr, "[%s] %d s=%d w=%ld\n",
- rComment.GetBuffer(),
+ pComment,
pEvent->type,
pEvent->xany.send_event,
pEvent->xany.window );
}
+#endif
// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
void SalDisplay::PrintInfo() const
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index 787b9aa..4967abe 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -4241,7 +4241,7 @@ long X11SalFrame::Dispatch( XEvent *pEvent )
CaptureMouse( sal_True );
#ifdef DBG_UTIL
if( -1 != nCaptured_ )
- pDisplay_->PrintEvent( "Captured", pEvent );
+ pDisplay_->DbgPrintDisplayEvent("Captured", pEvent);
#endif
}
commit 0b8f77c2944f94a9f13c7e8968f9071825f0d0f6
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jun 22 23:11:00 2011 +0100
ByteString->rtl::OString
diff --git a/vcl/inc/vcl/svapp.hxx b/vcl/inc/vcl/svapp.hxx
index 04ca07f..5437210 100644
--- a/vcl/inc/vcl/svapp.hxx
+++ b/vcl/inc/vcl/svapp.hxx
@@ -166,7 +166,7 @@ class VCL_DLLPUBLIC ApplicationEvent
{
private:
UniString aSenderAppName; // Absender Applikationsname
- ByteString aEvent; // Event
+ rtl::OString m_aEvent; // Event
UniString aData; // Uebertragene Daten
ApplicationAddress aAppAddr; // Absender Addresse
@@ -174,11 +174,11 @@ public:
ApplicationEvent() {}
ApplicationEvent( const UniString& rSenderAppName,
const ApplicationAddress& rAppAddr,
- const ByteString& rEvent,
+ const rtl::OString& rEvent,
const UniString& rData );
const UniString& GetSenderAppName() const { return aSenderAppName; }
- const ByteString& GetEvent() const { return aEvent; }
+ const rtl::OString& GetEvent() const { return m_aEvent; }
const UniString& GetData() const { return aData; }
const ApplicationAddress& GetAppAddress() const { return aAppAddr; }
@@ -188,10 +188,10 @@ public:
inline ApplicationEvent::ApplicationEvent( const UniString& rSenderAppName,
const ApplicationAddress& rAppAddr,
- const ByteString& rEvent,
+ const rtl::OString& rEvent,
const UniString& rData ) :
aSenderAppName( rSenderAppName ),
- aEvent( rEvent ),
+ m_aEvent( rEvent ),
aData( rData ),
aAppAddr( rAppAddr )
{
commit 8182eb4139413a359c552d1f4480936342ab47ae
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jun 22 22:39:39 2011 +0100
ditch unused APPEVENT strings
diff --git a/vcl/inc/vcl/svapp.hxx b/vcl/inc/vcl/svapp.hxx
index 0f31434..04ca07f 100644
--- a/vcl/inc/vcl/svapp.hxx
+++ b/vcl/inc/vcl/svapp.hxx
@@ -161,8 +161,6 @@ inline sal_Bool ApplicationAddress::IsConnectToSame( const ApplicationAddress& r
#define APPEVENT_OPEN_STRING "Open"
#define APPEVENT_PRINT_STRING "Print"
-#define APPEVENT_DISKINSERT_STRING "DiskInsert"
-#define APPEVENT_SAVEDOCUMENTS_STRING "SaveDocuments"
class VCL_DLLPUBLIC ApplicationEvent
{
commit 53f8d25d631188609b901b37bf83a680e2b3288e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jun 22 22:38:54 2011 +0100
ditch unused inline methods
diff --git a/vcl/inc/vcl/svapp.hxx b/vcl/inc/vcl/svapp.hxx
index d443149..0f31434 100644
--- a/vcl/inc/vcl/svapp.hxx
+++ b/vcl/inc/vcl/svapp.hxx
@@ -184,10 +184,6 @@ public:
const UniString& GetData() const { return aData; }
const ApplicationAddress& GetAppAddress() const { return aAppAddr; }
- sal_Bool IsOpenEvent() const;
- sal_Bool IsPrintEvent() const;
- sal_Bool IsDiskInsertEvent() const;
-
sal_uInt16 GetParamCount() const { return aData.GetTokenCount( APPEVENT_PARAM_DELIMITER ); }
UniString GetParam( sal_uInt16 nParam ) const { return aData.GetToken( nParam, APPEVENT_PARAM_DELIMITER ); }
};
@@ -203,30 +199,6 @@ inline ApplicationEvent::ApplicationEvent( const UniString& rSenderAppName,
{
}
-inline sal_Bool ApplicationEvent::IsOpenEvent() const
-{
- if ( aEvent.Equals( APPEVENT_OPEN_STRING ))
- return sal_True;
- else
- return sal_False;
-}
-
-inline sal_Bool ApplicationEvent::IsPrintEvent() const
-{
- if ( aEvent.Equals( APPEVENT_PRINT_STRING ))
- return sal_True;
- else
- return sal_False;
-}
-
-inline sal_Bool ApplicationEvent::IsDiskInsertEvent() const
-{
- if ( aEvent.Equals( APPEVENT_DISKINSERT_STRING ))
- return sal_True;
- else
- return sal_False;
-}
-
class VCL_DLLPUBLIC PropertyHandler
{
public:
More information about the Libreoffice-commits
mailing list