diff options
| author | Cao Cuong Ngo <cao.cuong.ngo@gmail.com> | 2013-09-21 23:36:06 +0200 |
|---|---|---|
| committer | Cao Cuong Ngo <cao.cuong.ngo@gmail.com> | 2013-09-26 16:15:39 +0200 |
| commit | 34f4d2574987b272681b5843e8f5edc374f55fde (patch) | |
| tree | 286bc62f7382aec34deb98af0565dea9b6ad4a19 /sfx2 | |
| parent | 92db3f7c397ba5508daa386e19caf2b1661ec4b4 (diff) | |
CMIS file picker: it really does not like ID Mark
The file picker can't go back folder if we use
ID mark in the URL.
Conflicts:
ucb/source/ucp/cmis/cmis_content.cxx
Change-Id: I6985feec71dc23848ee022e0bab9e8515a21ffd2
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/doc/docfile.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 710ea5f73a5b..329cfb8aee5c 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -2479,7 +2479,7 @@ void SfxMedium::Init_Impl() { if ( aUrl.HasMark() ) { - // keep the Mark to store the Document ID + pImp->m_aLogicName = aUrl.GetURLNoMark( INetURLObject::NO_DECODE ); GetItemSet()->Put( SfxStringItem( SID_JUMPMARK, aUrl.GetMark() ) ); } @@ -2994,7 +2994,8 @@ const INetURLObject& SfxMedium::GetURLObject() const if (!pImp->m_pURLObj) { pImp->m_pURLObj = new INetURLObject( pImp->m_aLogicName ); - // keep the Mark to store the Document ID + if (pImp->m_pURLObj->HasMark()) + *pImp->m_pURLObj = INetURLObject( pImp->m_aLogicName ).GetURLNoMark(); } return *pImp->m_pURLObj; |