summaryrefslogtreecommitdiff
path: root/include/sot
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-05-06 16:30:56 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-05-07 11:05:03 +0200
commite14b7660f622a83fe97635649674ade05fe1eb72 (patch)
treedf16ecd543f999c0872765265fb6292351ab8955 /include/sot
parent2aa9110ed0bf8c4e678caffa1677143b3290240b (diff)
Remove SvStorage alias
Change-Id: Id07ace147ff4fd4a17d05ba3cce6408def05c9c7
Diffstat (limited to 'include/sot')
-rw-r--r--include/sot/storage.hxx6
-rw-r--r--include/sot/storinfo.hxx4
2 files changed, 4 insertions, 6 deletions
diff --git a/include/sot/storage.hxx b/include/sot/storage.hxx
index 3ce2e978fb6a..3c6f46ed8f5a 100644
--- a/include/sot/storage.hxx
+++ b/include/sot/storage.hxx
@@ -47,7 +47,7 @@ template<> struct typed_flags<StorageMode>: is_typed_flags<StorageMode, 0xC4>
}
-class SvStorage;
+class SotStorage;
enum class SotClipboardFormatId : sal_uLong;
@@ -106,7 +106,7 @@ class UNOStorageHolder;
class SOT_DLLPUBLIC SotStorage : virtual public SotObject
{
friend class SotStorageStream;
-friend class SvStorage;
+friend class SotStorage;
BaseStorage * m_pOwnStg; // target storage
SvStream * m_pStorStm; // only for SDSTORAGES
@@ -219,8 +219,6 @@ public:
typedef tools::SvRef<SotStorage> SotStorageRef;
#endif
-#define SvStorage SotStorage
-
#endif // _SVSTOR_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sot/storinfo.hxx b/include/sot/storinfo.hxx
index 4820bfcb2635..1793a68a7239 100644
--- a/include/sot/storinfo.hxx
+++ b/include/sot/storinfo.hxx
@@ -29,14 +29,14 @@
class StgDirEntry;
class SvStorageInfo
{
-friend class SvStorage;
+friend class SotStorage;
OUString aName;
SvGlobalName aClassName;
sal_uLong nSize;
bool bStream;
bool bStorage;
- SvStorageInfo(){}; // Fuer SvStorage
+ SvStorageInfo(){}; // Fuer SotStorage
public:
SvStorageInfo( const StgDirEntry& );
SvStorageInfo( const OUString& rName, sal_uLong nSz, bool bIsStorage )