basebmp/source/bitmapdevice.cxx | 3 - ios/CustomTarget_Viewer_app.mk | 12 ++++ ios/experimental/Viewer/Viewer.xcodeproj/project.pbxproj | 38 ++++++++++++++- ios/experimental/Viewer/Viewer/LOViewerAppDelegate.mm | 6 +- ios/experimental/Viewer/Viewer/lo-viewer.mm | 4 + sal/inc/osl/detail/ios-bootstrap.h | 1 sc/source/ui/docshell/docsh4.cxx | 3 - tools/inc/tools/gen.hxx | 7 +- vcl/ios/iosinst.cxx | 8 +++ 9 files changed, 75 insertions(+), 7 deletions(-)
New commits: commit bcb57baaae2d7e6914ab4dd8eb5232aeacddbb72 Author: Tor Lillqvist <t...@iki.fi> Date: Tue Mar 26 00:24:29 2013 +0200 Use the applicationFrame and not whole screen size Change-Id: I33a67b4908759913e49608110cc2635cc50e54b1 diff --git a/ios/experimental/Viewer/Viewer/LOViewerAppDelegate.mm b/ios/experimental/Viewer/Viewer/LOViewerAppDelegate.mm index 7e7216f..271342b 100644 --- a/ios/experimental/Viewer/Viewer/LOViewerAppDelegate.mm +++ b/ios/experimental/Viewer/Viewer/LOViewerAppDelegate.mm @@ -26,7 +26,7 @@ static UIWindow *theWindow; (void) application; (void) launchOptions; - CGRect bounds = [[UIScreen mainScreen] bounds]; + CGRect bounds = [[UIScreen mainScreen] applicationFrame]; self.window = [[LOViewerWindow alloc] initWithFrame:bounds]; theWindow = self.window; commit 6d7d274151d18be9c806f72ac3ce10638e483bea Author: Tor Lillqvist <t...@iki.fi> Date: Mon Mar 25 20:29:28 2013 +0200 I think kCGImageAlphaNoneSkipLast is what we want Change-Id: I19a5ab15650cef4ee834af63e19bea7807b77477 diff --git a/ios/experimental/Viewer/Viewer/LOViewerAppDelegate.mm b/ios/experimental/Viewer/Viewer/LOViewerAppDelegate.mm index 9f72b35..7e7216f 100644 --- a/ios/experimental/Viewer/Viewer/LOViewerAppDelegate.mm +++ b/ios/experimental/Viewer/Viewer/LOViewerAppDelegate.mm @@ -39,7 +39,7 @@ static UIWindow *theWindow; memset(pixelBuffer, 0xFF, nbytes); CGDataProviderRef provider = CGDataProviderCreateWithData( NULL, pixelBuffer, nbytes, NULL); - image = CGImageCreate(bounds.size.width, bounds.size.height, 8, 32, bounds.size.width*4, CGColorSpaceCreateDeviceRGB(), kCGImageAlphaFirst, provider, NULL, false, kCGRenderingIntentDefault); + image = CGImageCreate(bounds.size.width, bounds.size.height, 8, 32, bounds.size.width*4, CGColorSpaceCreateDeviceRGB(), kCGImageAlphaNoneSkipLast, provider, NULL, false, kCGRenderingIntentDefault); self.window.bounds = bounds; self.window.pixelBuffer = pixelBuffer; commit 881814077515605ab4f816530b81709663de50a2 Author: Tor Lillqvist <t...@iki.fi> Date: Mon Mar 25 19:52:30 2013 +0200 Introduce temporary lo_set_view_size() hack like on Android and call it Change-Id: I44df0946f59d1b9a2a6ea935b3c2ea3c96c1260d diff --git a/ios/experimental/Viewer/Viewer/LOViewerAppDelegate.mm b/ios/experimental/Viewer/Viewer/LOViewerAppDelegate.mm index f9678c4..9f72b35 100644 --- a/ios/experimental/Viewer/Viewer/LOViewerAppDelegate.mm +++ b/ios/experimental/Viewer/Viewer/LOViewerAppDelegate.mm @@ -45,6 +45,8 @@ static UIWindow *theWindow; self.window.pixelBuffer = pixelBuffer; self.window.image = image; + lo_set_view_size(bounds.size.width, bounds.size.height); + [self.window makeKeyAndVisible]; NSThread* thread = [[NSThread alloc] initWithTarget:self diff --git a/sal/inc/osl/detail/ios-bootstrap.h b/sal/inc/osl/detail/ios-bootstrap.h index d5fd947..4738f28 100644 --- a/sal/inc/osl/detail/ios-bootstrap.h +++ b/sal/inc/osl/detail/ios-bootstrap.h @@ -42,6 +42,7 @@ void lo_damaged(); /* 2) */ void lo_runMain(); +void lo_set_view_size(int width, int height); void lo_render_windows(char *pixelBuffer, int width, int height); #ifdef __cplusplus diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx index b2178e9..8e3137b 100644 --- a/vcl/ios/iosinst.cxx +++ b/vcl/ios/iosinst.cxx @@ -297,6 +297,14 @@ int IosSalSystem::ShowNativeDialog( const rtl::OUString& rTitle, } extern "C" +void lo_set_view_size(int width, int height) +{ + // Horrible + viewWidth = width; + viewHeight = height; +} + +extern "C" void lo_render_windows(char *pixelBuffer, int width, int height) { // Hack: assume so far that we are asked to redraw the whole pixel buffer commit 89d9b9e252f0584afb0e0d995c80c114697a7aa1 Author: Tor Lillqvist <t...@iki.fi> Date: Mon Mar 25 17:55:19 2013 +0200 Log also corresponding destructions of BitmapDevice Change-Id: Ic74032b430691215482172c3c5f834374d47873d diff --git a/basebmp/source/bitmapdevice.cxx b/basebmp/source/bitmapdevice.cxx index 24916f6..a6774d1 100644 --- a/basebmp/source/bitmapdevice.cxx +++ b/basebmp/source/bitmapdevice.cxx @@ -1090,6 +1090,7 @@ BitmapDevice::BitmapDevice( const basegfx::B2IBox& rBounds, BitmapDevice::~BitmapDevice() { // outline, because of internal ImplBitmapDevice + SAL_INFO( "basebmp.bitmapdevice", "~BitmapDevice(" << this << ")" ); } basegfx::B2IVector BitmapDevice::getSize() const @@ -2038,7 +2039,7 @@ BitmapDeviceSharedPtr createBitmapDeviceImpl( const basegfx::B2IVector& << rSize.getX() << "x" << rSize.getY() << (bTopDown ? " top-down " : " bottom-up ") << Format::formatName(nScanlineFormat) - << " = " << result ); + << " = " << result.get() ); return result; } commit 1b57a3b5238e56abc51ba0f1cb6053b7a2001f7e Author: Tor Lillqvist <t...@iki.fi> Date: Mon Mar 25 17:39:04 2013 +0200 Add svt and svx Change-Id: I3298b985bc7f197e50f7246c8fe828d51804bde3 diff --git a/ios/experimental/Viewer/Viewer/lo-viewer.mm b/ios/experimental/Viewer/Viewer/lo-viewer.mm index 97669f1..865cb7d 100644 --- a/ios/experimental/Viewer/Viewer/lo-viewer.mm +++ b/ios/experimental/Viewer/Viewer/lo-viewer.mm @@ -65,6 +65,8 @@ extern "C" { extern void * smd_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * spell_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * svgfilter_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * svt_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); + extern void * svx_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * sw_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * swd_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); extern void * t602filter_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey ); @@ -110,6 +112,8 @@ lo_get_libmap(void) { "libsmlo.a", sm_component_getFactory }, { "libspelllo.a", spell_component_getFactory }, { "libsvgfilterlo.a", svgfilter_component_getFactory }, + { "libsvtlo.a", svt_component_getFactory }, + { "libsvxlo.a", svx_component_getFactory }, { "libswdlo.a", swd_component_getFactory }, { "libswlo.a", sw_component_getFactory }, { "libt602filterlo.a", t602filter_component_getFactory }, commit 753d0de3741ff30036672b6d8f91440582fe0edb Author: Tor Lillqvist <t...@iki.fi> Date: Mon Mar 25 17:37:04 2013 +0200 Add the soffice.cfg and registry stuff Change-Id: I12dda660f4eac298af29cee8858f8aef496aa5ed diff --git a/ios/CustomTarget_Viewer_app.mk b/ios/CustomTarget_Viewer_app.mk index 436bf46..29868e8 100644 --- a/ios/CustomTarget_Viewer_app.mk +++ b/ios/CustomTarget_Viewer_app.mk @@ -89,6 +89,18 @@ $(SCRIPT_OUTPUT_FILE_0) : $(call gb_Executable_get_target,Viewer) mkdir -p $(appdir)/share/config cp -R $(OUTDIR)/bin/images_tango.zip $(appdir)/share/config/images.zip # +# soffice.cfg +# + mkdir -p $(appdir)/share/config/soffice.cfg + cp -R $(OUTDIR)/xml/uiconfig/* $(appdir)/share/config/soffice.cfg +# +# "registry" +# + mkdir -p $(appdir)/share/registry/res + cp $(OUTDIR)/xml/*.xcd $(appdir)/share/registry + mv $(appdir)/share/registry/fcfg_langpack_en-US.xcd $(appdir)/share/registry/res + cp -R $(OUTDIR)/xml/registry/* $(appdir)/share/registry +# # Set up rc, the "inifile". See getIniFileName_Impl(). # ( \ commit f222e81cb88bc211076d92f52abed3349d3f4806 Author: Tor Lillqvist <t...@iki.fi> Date: Mon Mar 25 12:38:24 2013 +0200 Change how Rectangles are printed, special case for EMPTY Change-Id: I0fe230875e785b811ae09e04399790a53b354dd6 diff --git a/tools/inc/tools/gen.hxx b/tools/inc/tools/gen.hxx index 1819a90..028d504 100644 --- a/tools/inc/tools/gen.hxx +++ b/tools/inc/tools/gen.hxx @@ -679,8 +679,11 @@ template< typename charT, typename traits > inline std::basic_ostream<charT, traits> & operator <<( std::basic_ostream<charT, traits> & stream, const Rectangle& rectangle ) { - return stream << rectangle.getX() << ',' << rectangle.getY() << ' ' - << rectangle.getWidth() << 'x' << rectangle.getHeight(); + if (rectangle.IsEmpty()) + return stream << "EMPTY"; + else + return stream << rectangle.getWidth() << 'x' << rectangle.getHeight() + << "@(" << rectangle.getX() << ',' << rectangle.getY() << ")"; } #endif commit 74fa38afcd9be0f8cd3dd5cc3606269d99ff24ae Author: Tor Lillqvist <t...@iki.fi> Date: Mon Mar 25 12:35:49 2013 +0200 Add to the project some source files where breakpoints are often useful Change-Id: Iccd5f7bb99a76542481564b2f6475ca365756e45 diff --git a/ios/experimental/Viewer/Viewer.xcodeproj/project.pbxproj b/ios/experimental/Viewer/Viewer.xcodeproj/project.pbxproj index bef9ae0..3ba5a67 100644 --- a/ios/experimental/Viewer/Viewer.xcodeproj/project.pbxproj +++ b/ios/experimental/Viewer/Viewer.xcodeproj/project.pbxproj @@ -20,6 +20,8 @@ /* Begin PBXFileReference section */ BE08805B16FDB784000CED5C /* LOViewerWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LOViewerWindow.h; sourceTree = "<group>"; }; BE08805C16FDB784000CED5C /* LOViewerWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LOViewerWindow.m; sourceTree = "<group>"; }; + BE4EEE9916FF724200D475B2 /* bitmapdevice.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = bitmapdevice.cxx; path = ../../../../basebmp/source/bitmapdevice.cxx; sourceTree = "<group>"; }; + BE4EEE9A16FF80B100D475B2 /* virdev.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = virdev.cxx; path = ../../../../vcl/source/gdi/virdev.cxx; sourceTree = "<group>"; }; BE5A22551664F87600CF01C9 /* Viewer.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Viewer.app; sourceTree = BUILT_PRODUCTS_DIR; }; BE5A22591664F87600CF01C9 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; BE5A225B1664F87600CF01C9 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; @@ -38,6 +40,22 @@ BE69AD8A1695954D001BE1CD /* Icon-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-72.png"; sourceTree = "<group>"; }; BE69AD8B1695954D001BE1CD /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Icon.png; sourceTree = "<group>"; }; BE69AD8C1695954D001BE1CD /* i...@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "i...@2x.png"; sourceTree = "<group>"; }; + BE9086F616FF02B2004400A1 /* headlessinst.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = headlessinst.cxx; path = ../../../../vcl/headless/headlessinst.cxx; sourceTree = "<group>"; }; + BE9086F716FF02B2004400A1 /* svpbmp.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = svpbmp.cxx; path = ../../../../vcl/headless/svpbmp.cxx; sourceTree = "<group>"; }; + BE9086F816FF02B2004400A1 /* svpdata.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = svpdata.cxx; path = ../../../../vcl/headless/svpdata.cxx; sourceTree = "<group>"; }; + BE9086F916FF02B2004400A1 /* svpdummies.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = svpdummies.cxx; path = ../../../../vcl/headless/svpdummies.cxx; sourceTree = "<group>"; }; + BE9086FA16FF02B3004400A1 /* svpelement.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = svpelement.cxx; path = ../../../../vcl/headless/svpelement.cxx; sourceTree = "<group>"; }; + BE9086FB16FF02B3004400A1 /* svpframe.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = svpframe.cxx; path = ../../../../vcl/headless/svpframe.cxx; sourceTree = "<group>"; }; + BE9086FC16FF02B3004400A1 /* svpgdi.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = svpgdi.cxx; path = ../../../../vcl/headless/svpgdi.cxx; sourceTree = "<group>"; }; + BE9086FD16FF02B3004400A1 /* svpinst.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = svpinst.cxx; path = ../../../../vcl/headless/svpinst.cxx; sourceTree = "<group>"; }; + BE9086FE16FF02B3004400A1 /* svpprn.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = svpprn.cxx; path = ../../../../vcl/headless/svpprn.cxx; sourceTree = "<group>"; }; + BE9086FF16FF02B3004400A1 /* svptext.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = svptext.cxx; path = ../../../../vcl/headless/svptext.cxx; sourceTree = "<group>"; }; + BE90870016FF02B3004400A1 /* svpvd.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = svpvd.cxx; path = ../../../../vcl/headless/svpvd.cxx; sourceTree = "<group>"; }; + BEBF3E3A17002D0200C454AC /* svapp.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = svapp.cxx; path = ../../../../vcl/source/app/svapp.cxx; sourceTree = "<group>"; }; + BEBF3E3B17002D0200C454AC /* svmain.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = svmain.cxx; path = ../../../../vcl/source/app/svmain.cxx; sourceTree = "<group>"; }; + BEBF3E3C17002D4C00C454AC /* frame.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = frame.cxx; path = ../../../../framework/source/services/frame.cxx; sourceTree = "<group>"; }; + BEBF3E3D17002D6900C454AC /* window.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = window.cxx; path = ../../../../vcl/source/window/window.cxx; sourceTree = "<group>"; }; + BEBF3E3E17005E6B00C454AC /* frmload.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = frmload.cxx; path = ../../../../sfx2/source/view/frmload.cxx; sourceTree = "<group>"; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -82,11 +100,29 @@ BE5A225F1664F87600CF01C9 /* Viewer */ = { isa = PBXGroup; children = ( - BE69AD3716958CA0001BE1CD /* Resources */, + BE4EEE9916FF724200D475B2 /* bitmapdevice.cxx */, + BEBF3E3C17002D4C00C454AC /* frame.cxx */, + BEBF3E3E17005E6B00C454AC /* frmload.cxx */, + BE9086F616FF02B2004400A1 /* headlessinst.cxx */, BE5A22681664F87600CF01C9 /* LOViewerAppDelegate.h */, BE5A22691664F87600CF01C9 /* LOViewerAppDelegate.mm */, BE08805B16FDB784000CED5C /* LOViewerWindow.h */, BE08805C16FDB784000CED5C /* LOViewerWindow.m */, + BEBF3E3A17002D0200C454AC /* svapp.cxx */, + BEBF3E3B17002D0200C454AC /* svmain.cxx */, + BE9086F716FF02B2004400A1 /* svpbmp.cxx */, + BE9086F816FF02B2004400A1 /* svpdata.cxx */, + BE9086F916FF02B2004400A1 /* svpdummies.cxx */, + BE9086FA16FF02B3004400A1 /* svpelement.cxx */, + BE9086FB16FF02B3004400A1 /* svpframe.cxx */, + BE9086FC16FF02B3004400A1 /* svpgdi.cxx */, + BE9086FD16FF02B3004400A1 /* svpinst.cxx */, + BE9086FE16FF02B3004400A1 /* svpprn.cxx */, + BE9086FF16FF02B3004400A1 /* svptext.cxx */, + BE90870016FF02B3004400A1 /* svpvd.cxx */, + BE4EEE9A16FF80B100D475B2 /* virdev.cxx */, + BEBF3E3D17002D6900C454AC /* window.cxx */, + BE69AD3716958CA0001BE1CD /* Resources */, BE5A22601664F87600CF01C9 /* Supporting Files */, ); path = Viewer; commit eac68782f9c4b4025f4daf68c65e77719d5c736f Author: Tor Lillqvist <t...@iki.fi> Date: Sun Mar 24 08:14:05 2013 +0200 WaE: Variable set but not used Change-Id: Ia9dac8262d08a5727ff0518eeec189c99b768504 diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 81756c9..f9c09de 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -727,12 +727,13 @@ void ScDocShell::Execute( SfxRequest& rReq ) if ( !pOtherDocSh->GetError() ) // nur Errors { sal_Bool bHadTrack = ( aDocument.GetChangeTrack() != NULL ); +#ifdef LIBO_FEATURE_DESKTOP sal_uLong nStart = 0; if ( nSlot == SID_DOCUMENT_MERGE && pChangeTrack ) { nStart = pChangeTrack->GetActionMax() + 1; } - +#endif if ( nSlot == SID_DOCUMENT_COMPARE ) CompareDocument( *pOtherDocSh->GetDocument() ); else _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits