Commits

Anonymous committed e5507b8 Merge

CWS-TOOLING: integrate CWS oooimprovement5_DEV300

Comments (0)

Files changed (5)

comphelper/source/misc/uieventslogger.cxx

             UiEventsLogger_Impl();
             void initializeLogger();
             void logDispatch(const ::com::sun::star::util::URL& url,
-				const Sequence<PropertyValue>& args);
+                const Sequence<PropertyValue>& args);
             void logRotated();
             void logVcl(const ::rtl::OUString& parent_id,
                 sal_Int32 window_type,
     };
 }
 
-namespace comphelper 
+namespace comphelper
 {
     // consts
     const sal_Int32 UiEventsLogger_Impl::COLUMNS = 9;
             logdata[3] = URL_FILE;
         else
             logdata[3] = url.Main;
+        OSL_TRACE("UiEventsLogger Logging: %s,%s,%s,%s,%s,%s,%s,%s",
+            OUStringToOString(logdata[0],RTL_TEXTENCODING_UTF8).getStr(),
+            OUStringToOString(logdata[1],RTL_TEXTENCODING_UTF8).getStr(),
+            OUStringToOString(logdata[2],RTL_TEXTENCODING_UTF8).getStr(),
+            OUStringToOString(logdata[3],RTL_TEXTENCODING_UTF8).getStr(),
+            OUStringToOString(logdata[4],RTL_TEXTENCODING_UTF8).getStr(),
+            OUStringToOString(logdata[5],RTL_TEXTENCODING_UTF8).getStr(),
+            OUStringToOString(logdata[6],RTL_TEXTENCODING_UTF8).getStr(),
+            OUStringToOString(logdata[7],RTL_TEXTENCODING_UTF8).getStr(),
+            OUStringToOString(logdata[8],RTL_TEXTENCODING_UTF8).getStr());
         m_Logger->log(LogLevel::INFO, m_Formatter->formatMultiColumn(logdata));
         m_SessionLogEventCount++;
     }
     {
         Sequence<OUString> logdata = Sequence<OUString>(COLUMNS);
         logdata[0] = ETYPE_ROTATED;
+        OSL_TRACE("UiEventsLogger Logging: %s,%s,%s,%s,%s,%s,%s,%s",
+            OUStringToOString(logdata[0],RTL_TEXTENCODING_UTF8).getStr(),
+            OUStringToOString(logdata[1],RTL_TEXTENCODING_UTF8).getStr(),
+            OUStringToOString(logdata[2],RTL_TEXTENCODING_UTF8).getStr(),
+            OUStringToOString(logdata[3],RTL_TEXTENCODING_UTF8).getStr(),
+            OUStringToOString(logdata[4],RTL_TEXTENCODING_UTF8).getStr(),
+            OUStringToOString(logdata[5],RTL_TEXTENCODING_UTF8).getStr(),
+            OUStringToOString(logdata[6],RTL_TEXTENCODING_UTF8).getStr(),
+            OUStringToOString(logdata[7],RTL_TEXTENCODING_UTF8).getStr(),
+            OUStringToOString(logdata[8],RTL_TEXTENCODING_UTF8).getStr());
         m_Logger->log(LogLevel::INFO, m_Formatter->formatMultiColumn(logdata));
     }
 
         logdata[6] = id;
         logdata[7] = method;
         logdata[8] = param;
+        OSL_TRACE("UiEventsLogger Logging: %s,%s,%s,%s,%s,%s,%s,%s",
+            OUStringToOString(logdata[0],RTL_TEXTENCODING_UTF8).getStr(),
+            OUStringToOString(logdata[1],RTL_TEXTENCODING_UTF8).getStr(),
+            OUStringToOString(logdata[2],RTL_TEXTENCODING_UTF8).getStr(),
+            OUStringToOString(logdata[3],RTL_TEXTENCODING_UTF8).getStr(),
+            OUStringToOString(logdata[4],RTL_TEXTENCODING_UTF8).getStr(),
+            OUStringToOString(logdata[5],RTL_TEXTENCODING_UTF8).getStr(),
+            OUStringToOString(logdata[6],RTL_TEXTENCODING_UTF8).getStr(),
+            OUStringToOString(logdata[7],RTL_TEXTENCODING_UTF8).getStr(),
+            OUStringToOString(logdata[8],RTL_TEXTENCODING_UTF8).getStr());
         m_Logger->log(LogLevel::INFO, m_Formatter->formatMultiColumn(logdata));
         m_SessionLogEventCount++;
     }

extensions/source/logging/filehandler.cxx

     void SAL_CALL FileHandler::flush(  ) throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
-        // nothing to do, our ::osl::File implementation is not buffered
+        if(!m_pFile.get())
+        {
+            OSL_PRECOND(false, "FileHandler::flush: no file!");
+            return;
+        }
+        #if OSL_DEBUG_LEVEL > 0
+            ::osl::FileBase::RC res =
+        #endif
+                m_pFile->sync();
+        OSL_ENSURE(res == ::osl::FileBase::E_None, "FileHandler::flush: Could not sync logfile to filesystem.");
     }
     
     //--------------------------------------------------------------------

extensions/source/logging/logger.cxx

 
         m_aHandlers.forEach< XLogHandler >(
             ::boost::bind( &XLogHandler::publish, _1, ::boost::cref( _rRecord ) ) );
+        m_aHandlers.forEach< XLogHandler >(
+            ::boost::bind( &XLogHandler::flush, _1 ) );
     }
 
     //--------------------------------------------------------------------

svx/source/cui/optimprove2.cxx

     {
         ::rtl::OUString sLogFile( m_sLogPath );
         sLogFile += C2S("/Current.csv");
-        uno::Sequence< beans::PropertyValue > aArgs;
+        uno::Sequence< beans::PropertyValue > aArgs(3);
+		aArgs[0].Name = ::rtl::OUString::createFromAscii("FilterName");
+		aArgs[0].Value = uno::makeAny(::rtl::OUString::createFromAscii("Text - txt - csv (StarCalc)"));
+		aArgs[1].Name = ::rtl::OUString::createFromAscii("FilterOptions");
+		aArgs[1].Value = uno::makeAny(::rtl::OUString::createFromAscii("44,34,12,1,"));
+		aArgs[2].Name = ::rtl::OUString::createFromAscii("ReadOnly");
+		aArgs[2].Value = uno::makeAny(true);
 
         uno::Reference< lang::XComponent > xDoc = ::comphelper::SynchronousDispatch::dispatch(
             xDesktop, sLogFile, C2S("_default"), 0, aArgs );

sw/source/core/txtnode/fntcache.cxx

     const xub_StrLen nEnd = rInf.GetIdx() + rInf.GetLen();
 
     // skip character cells for complex scripts
-    if ( rInf.GetFont() && SW_CTL == rInf.GetFont()->GetActual() &&
+    // --> OD 2009-10-14 #i105571# - skip also character cells for CJK
+    if ( rInf.GetFont() && 
+         ( SW_CTL == rInf.GetFont()->GetActual() ||
+           SW_CJK == rInf.GetFont()->GetActual() ) &&
          pBreakIt->GetBreakIter().is() )
+    // <--
     {
         aLang = rInf.GetFont()->GetLanguage();
         bSkipCell = sal_True;