Kaydet (Commit) 098df79f authored tarafından Matteo Casalin's avatar Matteo Casalin

Formatting and bail-out early (to not re-format too much)

Change-Id: If4c55fe669f7bb861baca0ae224675ca74004de5
üst 0871b509
...@@ -398,9 +398,9 @@ SvGlobalName GetClassId_Impl( SotClipboardFormatId nFormat ) ...@@ -398,9 +398,9 @@ SvGlobalName GetClassId_Impl( SotClipboardFormatId nFormat )
// class, that uses the refcounted object as impl-class. // class, that uses the refcounted object as impl-class.
enum RepresentModes { enum RepresentModes {
nonset, nonset,
svstream, svstream,
xinputstream xinputstream
}; };
class UCBStorageStream_Impl : public SvRefBase, public SvStream class UCBStorageStream_Impl : public SvRefBase, public SvStream
...@@ -450,7 +450,7 @@ public: ...@@ -450,7 +450,7 @@ public:
BaseStorage* CreateStorage();// create an OLE Storage on the UCBStorageStream BaseStorage* CreateStorage();// create an OLE Storage on the UCBStorageStream
sal_uLong GetSize(); sal_uLong GetSize();
sal_uInt64 ReadSourceWriteTemporary( sal_uInt64 aLength ); // read aLength from source and copy to temporary, sal_uInt64 ReadSourceWriteTemporary( sal_uInt64 aLength ); // read aLength from source and copy to temporary,
// no seeking is produced // no seeking is produced
sal_uLong ReadSourceWriteTemporary(); // read source till the end and copy to temporary, sal_uLong ReadSourceWriteTemporary(); // read source till the end and copy to temporary,
...@@ -489,10 +489,10 @@ public: ...@@ -489,10 +489,10 @@ public:
// this means that the root storage does an autocommit when its external // this means that the root storage does an autocommit when its external
// reference is destroyed // reference is destroyed
bool m_bIsRoot; // marks this storage as root storages that manages all oommits and reverts bool m_bIsRoot; // marks this storage as root storages that manages all oommits and reverts
bool m_bDirty; // ??? bool m_bDirty; // ???
bool m_bIsLinked; bool m_bIsLinked;
bool m_bListCreated; bool m_bListCreated;
SotClipboardFormatId m_nFormat; SotClipboardFormatId m_nFormat;
OUString m_aUserTypeName; OUString m_aUserTypeName;
SvGlobalName m_aClassId; SvGlobalName m_aClassId;
...@@ -518,22 +518,25 @@ public: ...@@ -518,22 +518,25 @@ public:
void ReadContent(); void ReadContent();
void CreateContent(); void CreateContent();
::ucbhelper::Content* GetContent() ::ucbhelper::Content* GetContent()
{ if ( !m_pContent ) CreateContent(); return m_pContent; } {
if ( !m_pContent )
CreateContent();
return m_pContent;
}
UCBStorageElementList_Impl& GetChildrenList() UCBStorageElementList_Impl& GetChildrenList()
{ {
long nError = m_nError; long nError = m_nError;
ReadContent(); ReadContent();
if ( m_nMode & StreamMode::WRITE ) if ( m_nMode & StreamMode::WRITE )
{
m_nError = nError;
if ( m_pAntiImpl )
{ {
m_pAntiImpl->ResetError(); m_nError = nError;
m_pAntiImpl->SetError( nError ); if ( m_pAntiImpl )
{
m_pAntiImpl->ResetError();
m_pAntiImpl->SetError( nError );
}
} }
} return m_aChildrenList;
return m_aChildrenList;
} }
void SetError( long nError ); void SetError( long nError );
...@@ -661,8 +664,7 @@ UCBStorageStream_Impl::UCBStorageStream_Impl( const OUString& rName, StreamMode ...@@ -661,8 +664,7 @@ UCBStorageStream_Impl::UCBStorageStream_Impl( const OUString& rName, StreamMode
if ( bRepair ) if ( bRepair )
{ {
xComEnv = new ::ucbhelper::CommandEnvironment( Reference< ::com::sun::star::task::XInteractionHandler >(), xComEnv = new ::ucbhelper::CommandEnvironment( Reference< ::com::sun::star::task::XInteractionHandler >(), xProgress );
xProgress );
aTemp += "?repairpackage"; aTemp += "?repairpackage";
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment